gwm17/catima
1
0
Fork 0
mirror of https://github.com/gwm17/catima.git synced 2024-11-22 18:28:51 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #79 from hrosiak/json_hpp

Browse Source 
json lib include and fetching
This commit is contained in:
Andrej Prochazka 2020-11-30 15:37:07 +01:00 committed by GitHub
parent 25cbcdcb25 d1cfd6e844
commit be0e763db4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -97,7 +97,7 @@ MESSAGE( STATUS "CMAKE_CXX_COMPILER: " ${CMAKE_CXX_COMPILER} )
######## for python module
find_package(PythonInterp)
if(PYTHONINTERP_FOUND)
message("-- Python found: ${PYTHON_EXECUTABLE}")
message(STATUS "Python found: ${PYTHON_EXECUTABLE}")
endif()
if(PYTHON_MODULE)
if(NOT PYTHONINTERP_FOUND)

19
bin/CMakeLists.txt
View File

@ -1,21 +1,28 @@
set(CATIMA_APPS catima_calculator)
find_package(nlohmann_json QUIET)
if(nlohmann_json_FOUND)
MESSAGE(STATUS "system nlohmann_json found ")
else(nlohmann_json_FOUND)
#MESSAGE(STATUS "nlohmann_json looking ")
include(ExternalProject)
ExternalProject_Add(
json_hpp
URL https://raw.githubusercontent.com/nlohmann/json/develop/single_include/nlohmann/json.hpp
DOWNLOAD_NO_EXTRACT 1
DOWNLOAD_NO_PROGRESS
URL https://github.com/nlohmann/json/releases/download/v3.9.1/include.zip
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
PREFIX "external"
)
ExternalProject_Get_Property(json_hpp download_dir)
ExternalProject_Get_Property(json_hpp SOURCE_DIR)
endif(nlohmann_json_FOUND)
foreach(entry ${CATIMA_APPS})
add_executable(${entry} ${entry}.cpp)
target_link_libraries(${entry} catima)
target_include_directories(${entry} PRIVATE ${download_dir})
target_link_libraries(${entry} catima )
#target_link_libraries(${entry} PRIVATE nlohmann_json::nlohmann_json)
target_include_directories(${entry} PRIVATE ${SOURCE_DIR}/include)
endforeach(entry in ${CATIMA_APPS})
install (TARGETS ${CATIMA_APPS} RUNTIME DESTINATION bin)

2
bin/catima_calculator.cpp
View File

@ -8,7 +8,7 @@
#include <stdexcept>
#include "catima/catima.h"
#include "catima/nucdata.h"
#include "json.hpp"
#include <nlohmann/json.hpp>
using namespace std;
using namespace catima;