Commit 54c86a08 authored by T.J. Corona's avatar T.J. Corona

Update nlohmann to latest master.

parent 6748e979
Pipeline #95853 passed with stage
......@@ -6,10 +6,6 @@ superbuild_add_project(nlohmannjson
-DBuildTests:BOOL=OFF
)
superbuild_apply_patch(nlohmannjson install
"Install nlohmann_json cmake files to a proper location."
)
# Provide our location to dependent projects:
superbuild_add_extra_cmake_args(
-Dnlohmann_json_DIR:PATH=<INSTALL_DIR>/lib/cmake/nlohmann_json
......
diff -U 5 -r orig/CMakeLists.txt src/CMakeLists.txt
--- orig/CMakeLists.txt 2017-02-25 10:43:15.000000000 -0500
+++ src/CMakeLists.txt 2017-09-16 13:01:15.000000000 -0400
@@ -11,11 +11,11 @@
set(JSON_TARGET_NAME ${PROJECT_NAME})
set(JSON_PACKAGE_NAME ${JSON_TARGET_NAME})
set(JSON_TARGETS_FILENAME "${JSON_PACKAGE_NAME}Targets.cmake")
set(JSON_CONFIG_FILENAME "${JSON_PACKAGE_NAME}Config.cmake")
set(JSON_CONFIGVERSION_FILENAME "${JSON_PACKAGE_NAME}ConfigVersion.cmake")
-set(JSON_CONFIG_DESTINATION "cmake")
+set(JSON_CONFIG_DESTINATION "lib/cmake/${JSON_PACKAGE_NAME}")
set(JSON_INCLUDE_DESTINATION "include/nlohmann")
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
# create and configure the library target
......@@ -157,5 +157,5 @@ superbuild_set_revision(smtkusersguide
URL "https://media.readthedocs.org/pdf/smtk/latest/smtk.pdf")
superbuild_set_revision(nlohmannjson
URL "https://data.kitware.com/api/v1/item/59bd45638d777f7d33e9d321/download"
URL_MD5 6b27f142b87b418b96f7c488d98dff05)
URL "http://www.computationalmodelbuilder.org/files/dependencies/json-b406e3704be9a185f1e27e35981ff6d5668dcdc3.tar.bz2"
URL_MD5 4aa8c3b403f535499cb633650d083150)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment