Mercurial > hg > orthanc
comparison Resources/CMake/JsonCppConfiguration.cmake @ 3160:fc9a4a2dad63
merge
author | Alain Mazy <alain@mazy.be> |
---|---|
date | Thu, 24 Jan 2019 10:55:19 +0100 |
parents | 0c2a8d5e0097 |
children | 1d403ecf3391 |
comparison
equal
deleted
inserted
replaced
3159:4cfed5c2eacd | 3160:fc9a4a2dad63 |
---|---|
1 set(JSONCPP_CXX11 OFF) | 1 set(JSONCPP_CXX11 OFF) |
2 | 2 |
3 if (STATIC_BUILD OR NOT USE_SYSTEM_JSONCPP) | 3 if (STATIC_BUILD OR NOT USE_SYSTEM_JSONCPP) |
4 if (USE_LEGACY_JSONCPP) | 4 if (USE_LEGACY_JSONCPP) |
5 set(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-0.10.6) | 5 set(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-0.10.6) |
6 set(JSONCPP_URL "http://www.orthanc-server.com/downloads/third-party/jsoncpp-0.10.6.tar.gz") | 6 set(JSONCPP_URL "http://orthanc.osimis.io/ThirdPartyDownloads/jsoncpp-0.10.6.tar.gz") |
7 set(JSONCPP_MD5 "13d1991d79697df8cadbc25c93e37c83") | 7 set(JSONCPP_MD5 "13d1991d79697df8cadbc25c93e37c83") |
8 add_definitions(-DORTHANC_LEGACY_JSONCPP=1) | 8 add_definitions(-DORTHANC_LEGACY_JSONCPP=1) |
9 else() | 9 else() |
10 set(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-1.8.4) | 10 set(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-1.8.4) |
11 set(JSONCPP_URL "http://www.orthanc-server.com/downloads/third-party/jsoncpp-1.8.4.tar.gz") | 11 set(JSONCPP_URL "http://orthanc.osimis.io/ThirdPartyDownloads/jsoncpp-1.8.4.tar.gz") |
12 set(JSONCPP_MD5 "fa47a3ab6b381869b6a5f20811198662") | 12 set(JSONCPP_MD5 "fa47a3ab6b381869b6a5f20811198662") |
13 add_definitions(-DORTHANC_LEGACY_JSONCPP=0) | 13 add_definitions(-DORTHANC_LEGACY_JSONCPP=0) |
14 set(JSONCPP_CXX11 ON) | 14 set(JSONCPP_CXX11 ON) |
15 endif() | 15 endif() |
16 | 16 |