File tree Expand file tree Collapse file tree 4 files changed +3
-20636
lines changed Expand file tree Collapse file tree 4 files changed +3
-20636
lines changed Original file line number Diff line number Diff line change @@ -98,7 +98,7 @@ if (FANS_LIBRARY_FOR_MICRO_MANAGER)
98
98
)
99
99
FetchContent_MakeAvailable(pybind11)
100
100
endif ()
101
-
101
+ find_package (nlohmann_json REQUIRED)
102
102
# ##############################################################################
103
103
# TARGETS
104
104
# ##############################################################################
@@ -141,7 +141,6 @@ target_include_directories(FANS_FANS PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SO
141
141
# FANS.h header that consuming projects can use
142
142
set_property (TARGET FANS_FANS PROPERTY PUBLIC_HEADER
143
143
include /general.h
144
- include /json.hpp
145
144
include /matmodel.h
146
145
include /reader.h
147
146
include /solverCG.h
@@ -200,6 +199,7 @@ target_link_libraries(FANS_FANS PUBLIC ${FFTW3_LIBRARIES})
200
199
target_compile_definitions (FANS_FANS PUBLIC ${FFTW3_DEFINITIONS} )
201
200
202
201
target_link_libraries (FANS_FANS PUBLIC Eigen3::Eigen)
202
+ target_link_libraries (FANS_FANS PUBLIC nlohmann_json::nlohmann_json)
203
203
204
204
target_link_libraries (FANS_main PRIVATE FANS::FANS)
205
205
Original file line number Diff line number Diff line change 17
17
using namespace std ;
18
18
19
19
// JSON
20
- #include < json.hpp>
20
+ #include < nlohmann/ json.hpp>
21
21
using nlohmann::json;
22
22
using namespace nlohmann ;
23
23
You can’t perform that action at this time.
0 commit comments