Mercurial > hg > orthanc

annotate Resources/CMake/JsonCppConfiguration.cmake @ 3803:e9834343d327

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade to openssl 1.1.1f
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 02 Apr 2020 13:25:48 +0200
parents c575fb0adf91
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2497
0611aa383e62 Upgrade to JsonCpp 1.8.4, and USE_LEGACY_JSONCPP option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2429
diff changeset
1 set(JSONCPP_CXX11 OFF)
0611aa383e62 Upgrade to JsonCpp 1.8.4, and USE_LEGACY_JSONCPP option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2429
diff changeset
2
735
ee0d5abf7958 dos2unix
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 634
diff changeset
3 if (STATIC_BUILD OR NOT USE_SYSTEM_JSONCPP)
2497
0611aa383e62 Upgrade to JsonCpp 1.8.4, and USE_LEGACY_JSONCPP option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2429
diff changeset
4 if (USE_LEGACY_JSONCPP)
3721
c575fb0adf91 upgraded jsoncpp to 0.10.7 for pre-C++11 compilers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3575
diff changeset
5 set(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-0.10.7)
c575fb0adf91 upgraded jsoncpp to 0.10.7 for pre-C++11 compilers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3575
diff changeset
6 set(JSONCPP_URL "http://orthanc.osimis.io/ThirdPartyDownloads/jsoncpp-0.10.7.tar.gz")
c575fb0adf91 upgraded jsoncpp to 0.10.7 for pre-C++11 compilers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3575
diff changeset
7 set(JSONCPP_MD5 "3a8072ca6a1fa9cbaf7715ae625f134f")
2497
0611aa383e62 Upgrade to JsonCpp 1.8.4, and USE_LEGACY_JSONCPP option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2429
diff changeset
8 add_definitions(-DORTHANC_LEGACY_JSONCPP=1)
0611aa383e62 Upgrade to JsonCpp 1.8.4, and USE_LEGACY_JSONCPP option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2429
diff changeset
9 else()
0611aa383e62 Upgrade to JsonCpp 1.8.4, and USE_LEGACY_JSONCPP option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2429
diff changeset
10 set(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-1.8.4)
3133
0c2a8d5e0097 moving third-party dependencies to another server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2782
diff changeset
11 set(JSONCPP_URL "http://orthanc.osimis.io/ThirdPartyDownloads/jsoncpp-1.8.4.tar.gz")
2497
0611aa383e62 Upgrade to JsonCpp 1.8.4, and USE_LEGACY_JSONCPP option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2429
diff changeset
12 set(JSONCPP_MD5 "fa47a3ab6b381869b6a5f20811198662")
0611aa383e62 Upgrade to JsonCpp 1.8.4, and USE_LEGACY_JSONCPP option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2429
diff changeset
13 add_definitions(-DORTHANC_LEGACY_JSONCPP=0)
0611aa383e62 Upgrade to JsonCpp 1.8.4, and USE_LEGACY_JSONCPP option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2429
diff changeset
14 set(JSONCPP_CXX11 ON)
0611aa383e62 Upgrade to JsonCpp 1.8.4, and USE_LEGACY_JSONCPP option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2429
diff changeset
15 endif()
1537
fbf763bb1fa3 error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1502
diff changeset
16
fbf763bb1fa3 error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1502
diff changeset
17 DownloadPackage(${JSONCPP_MD5} ${JSONCPP_URL} "${JSONCPP_SOURCES_DIR}")
735
ee0d5abf7958 dos2unix
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 634
diff changeset
18
1414
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1405
diff changeset
19 set(JSONCPP_SOURCES
735
ee0d5abf7958 dos2unix
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 634
diff changeset
20 ${JSONCPP_SOURCES_DIR}/src/lib_json/json_reader.cpp
ee0d5abf7958 dos2unix
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 634
diff changeset
21 ${JSONCPP_SOURCES_DIR}/src/lib_json/json_value.cpp
ee0d5abf7958 dos2unix
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 634
diff changeset
22 ${JSONCPP_SOURCES_DIR}/src/lib_json/json_writer.cpp
ee0d5abf7958 dos2unix
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 634
diff changeset
23 )
ee0d5abf7958 dos2unix
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 634
diff changeset
24
ee0d5abf7958 dos2unix
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 634
diff changeset
25 include_directories(
ee0d5abf7958 dos2unix
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 634
diff changeset
26 ${JSONCPP_SOURCES_DIR}/include
ee0d5abf7958 dos2unix
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 634
diff changeset
27 )
ee0d5abf7958 dos2unix
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 634
diff changeset
28
2782
64e3d4ab158d find sandboxed builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2497
diff changeset
29 if (NOT ENABLE_LOCALE)
64e3d4ab158d find sandboxed builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2497
diff changeset
30 add_definitions(-DJSONCPP_NO_LOCALE_SUPPORT=1)
64e3d4ab158d find sandboxed builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2497
diff changeset
31 endif()
64e3d4ab158d find sandboxed builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2497
diff changeset
32
735
ee0d5abf7958 dos2unix
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 634
diff changeset
33 source_group(ThirdParty\\JsonCpp REGULAR_EXPRESSION ${JSONCPP_SOURCES_DIR}/.*)
ee0d5abf7958 dos2unix
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 634
diff changeset
34
ee0d5abf7958 dos2unix
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 634
diff changeset
35 else()
1344
c86ad9b58eed jsoncpp lookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 735
diff changeset
36 find_path(JSONCPP_INCLUDE_DIR json/reader.h
c86ad9b58eed jsoncpp lookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 735
diff changeset
37 /usr/include/jsoncpp
c86ad9b58eed jsoncpp lookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 735
diff changeset
38 /usr/local/include/jsoncpp
c86ad9b58eed jsoncpp lookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 735
diff changeset
39 )
c86ad9b58eed jsoncpp lookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 735
diff changeset
40
c86ad9b58eed jsoncpp lookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 735
diff changeset
41 message("JsonCpp include dir: ${JSONCPP_INCLUDE_DIR}")
c86ad9b58eed jsoncpp lookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 735
diff changeset
42 include_directories(${JSONCPP_INCLUDE_DIR})
735
ee0d5abf7958 dos2unix
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 634
diff changeset
43 link_libraries(jsoncpp)
ee0d5abf7958 dos2unix
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 634
diff changeset
44
1405
dae2e28951c6 fix freebsd build
jodogne
parents: 1344
diff changeset
45 CHECK_INCLUDE_FILE_CXX(${JSONCPP_INCLUDE_DIR}/json/reader.h HAVE_JSONCPP_H)
dae2e28951c6 fix freebsd build
jodogne
parents: 1344
diff changeset
46 if (NOT HAVE_JSONCPP_H)
dae2e28951c6 fix freebsd build
jodogne
parents: 1344
diff changeset
47 message(FATAL_ERROR "Please install the libjsoncpp-dev package")
dae2e28951c6 fix freebsd build
jodogne
parents: 1344
diff changeset
48 endif()
dae2e28951c6 fix freebsd build
jodogne
parents: 1344
diff changeset
49
1947
c1053112b323 Switch to the C++11 standard if the version of JsonCpp is 1.y.z
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1537
diff changeset
50 # Switch to the C++11 standard if the version of JsonCpp is 1.y.z
c1053112b323 Switch to the C++11 standard if the version of JsonCpp is 1.y.z
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1537
diff changeset
51 if (EXISTS ${JSONCPP_INCLUDE_DIR}/json/version.h)
c1053112b323 Switch to the C++11 standard if the version of JsonCpp is 1.y.z
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1537
diff changeset
52 file(STRINGS
c1053112b323 Switch to the C++11 standard if the version of JsonCpp is 1.y.z
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1537
diff changeset
53 "${JSONCPP_INCLUDE_DIR}/json/version.h"
c1053112b323 Switch to the C++11 standard if the version of JsonCpp is 1.y.z
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1537
diff changeset
54 JSONCPP_VERSION_MAJOR1 REGEX
1948
jodogne
parents: 1947
diff changeset
55 ".*define JSONCPP_VERSION_MAJOR.*")
jodogne
parents: 1947
diff changeset
56
jodogne
parents: 1947
diff changeset
57 if (NOT JSONCPP_VERSION_MAJOR1)
jodogne
parents: 1947
diff changeset
58 message(FATAL_ERROR "Unable to extract the major version of JsonCpp")
jodogne
parents: 1947
diff changeset
59 endif()
jodogne
parents: 1947
diff changeset
60
1947
c1053112b323 Switch to the C++11 standard if the version of JsonCpp is 1.y.z
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1537
diff changeset
61 string(REGEX REPLACE
1948
jodogne
parents: 1947
diff changeset
62 ".*JSONCPP_VERSION_MAJOR.*([0-9]+)$" "\\1"
1947
c1053112b323 Switch to the C++11 standard if the version of JsonCpp is 1.y.z
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1537
diff changeset
63 JSONCPP_VERSION_MAJOR ${JSONCPP_VERSION_MAJOR1})
c1053112b323 Switch to the C++11 standard if the version of JsonCpp is 1.y.z
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1537
diff changeset
64 message("JsonCpp major version: ${JSONCPP_VERSION_MAJOR}")
c1053112b323 Switch to the C++11 standard if the version of JsonCpp is 1.y.z
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1537
diff changeset
65
2497
0611aa383e62 Upgrade to JsonCpp 1.8.4, and USE_LEGACY_JSONCPP option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2429
diff changeset
66 if (JSONCPP_VERSION_MAJOR GREATER 0)
0611aa383e62 Upgrade to JsonCpp 1.8.4, and USE_LEGACY_JSONCPP option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2429
diff changeset
67 set(JSONCPP_CXX11 ON)
1947
c1053112b323 Switch to the C++11 standard if the version of JsonCpp is 1.y.z
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1537
diff changeset
68 endif()
c1053112b323 Switch to the C++11 standard if the version of JsonCpp is 1.y.z
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1537
diff changeset
69 else()
c1053112b323 Switch to the C++11 standard if the version of JsonCpp is 1.y.z
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1537
diff changeset
70 message("Unable to detect the major version of JsonCpp, assuming < 1.0.0")
c1053112b323 Switch to the C++11 standard if the version of JsonCpp is 1.y.z
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1537
diff changeset
71 endif()
2497
0611aa383e62 Upgrade to JsonCpp 1.8.4, and USE_LEGACY_JSONCPP option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2429
diff changeset
72 endif()
1947
c1053112b323 Switch to the C++11 standard if the version of JsonCpp is 1.y.z
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1537
diff changeset
73
2497
0611aa383e62 Upgrade to JsonCpp 1.8.4, and USE_LEGACY_JSONCPP option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2429
diff changeset
74
0611aa383e62 Upgrade to JsonCpp 1.8.4, and USE_LEGACY_JSONCPP option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2429
diff changeset
75 if (JSONCPP_CXX11)
0611aa383e62 Upgrade to JsonCpp 1.8.4, and USE_LEGACY_JSONCPP option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2429
diff changeset
76 # Osimis has encountered problems when this macro is left at its
0611aa383e62 Upgrade to JsonCpp 1.8.4, and USE_LEGACY_JSONCPP option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2429
diff changeset
77 # default value (1000), so we increase this limit
0611aa383e62 Upgrade to JsonCpp 1.8.4, and USE_LEGACY_JSONCPP option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2429
diff changeset
78 # https://gitlab.kitware.com/third-party/jsoncpp/commit/56df2068470241f9043b676bfae415ed62a0c172
0611aa383e62 Upgrade to JsonCpp 1.8.4, and USE_LEGACY_JSONCPP option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2429
diff changeset
79 add_definitions(-DJSONCPP_DEPRECATED_STACK_LIMIT=5000)
0611aa383e62 Upgrade to JsonCpp 1.8.4, and USE_LEGACY_JSONCPP option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2429
diff changeset
80
3575
1d403ecf3391 fix for DCMTK if MinGW combined with C++11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3133
diff changeset
81 if (CMAKE_COMPILER_IS_GNUCXX)
1d403ecf3391 fix for DCMTK if MinGW combined with C++11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3133
diff changeset
82 message("Switching to C++11 standard in gcc, as version of JsonCpp is >= 1.0.0")
1d403ecf3391 fix for DCMTK if MinGW combined with C++11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3133
diff changeset
83 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -Wno-deprecated-declarations")
1d403ecf3391 fix for DCMTK if MinGW combined with C++11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3133
diff changeset
84 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
1d403ecf3391 fix for DCMTK if MinGW combined with C++11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3133
diff changeset
85 message("Switching to C++11 standard in clang, as version of JsonCpp is >= 1.0.0")
2497
0611aa383e62 Upgrade to JsonCpp 1.8.4, and USE_LEGACY_JSONCPP option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2429
diff changeset
86 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-deprecated-declarations")
0611aa383e62 Upgrade to JsonCpp 1.8.4, and USE_LEGACY_JSONCPP option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2429
diff changeset
87 endif()
735
ee0d5abf7958 dos2unix
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 634
diff changeset
88 endif()