diff --git a/projects/nlohmannjson.cmake b/projects/nlohmannjson.cmake index 666cbe74fed542e767491ef8c4698928c39f379a..42289dcee43a6c8788435c9ad53624bcb5231058 100644 --- a/projects/nlohmannjson.cmake +++ b/projects/nlohmannjson.cmake @@ -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=/lib/cmake/nlohmann_json diff --git a/projects/patches/nlohmannjson-install.patch b/projects/patches/nlohmannjson-install.patch deleted file mode 100644 index 118f7f80a5bf452116b25c0b3764f7cb01f2e4d5..0000000000000000000000000000000000000000 --- a/projects/patches/nlohmannjson-install.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 diff --git a/versions.cmake b/versions.cmake index 902aca85d7dc96c6b9ac4ce251a9f8ea35a7ae3a..2ff36b76ce436f21303b791d1d2c8a5eba4d9124 100644 --- a/versions.cmake +++ b/versions.cmake @@ -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)