comparison Orthanc/Resources/CMake/BoostConfiguration.cmake @ 175:dd1ad819ca33

sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 04 Jan 2018 07:34:54 +0100
parents af724b1d8440
children ab66a6baf2ae
comparison
equal deleted inserted replaced
174:81f16c5667ba 175:dd1ad819ca33
39 if (BOOST_STATIC) 39 if (BOOST_STATIC)
40 ## 40 ##
41 ## Parameters for static compilation of Boost 41 ## Parameters for static compilation of Boost
42 ## 42 ##
43 43
44 set(BOOST_NAME boost_1_64_0) 44 set(BOOST_NAME boost_1_65_1)
45 set(BOOST_BCP_SUFFIX bcpdigest-1.3.0) 45 set(BOOST_BCP_SUFFIX bcpdigest-1.3.1)
46 set(BOOST_MD5 "ecb266cf46adcc7f695ad12685871174") 46 set(BOOST_MD5 "92c9c603e56bbd7a450a305f08747d90")
47 set(BOOST_URL "http://www.orthanc-server.com/downloads/third-party/${BOOST_NAME}_${BOOST_BCP_SUFFIX}.tar.gz") 47 set(BOOST_URL "http://www.orthanc-server.com/downloads/third-party/${BOOST_NAME}_${BOOST_BCP_SUFFIX}.tar.gz")
48 set(BOOST_SOURCES_DIR ${CMAKE_BINARY_DIR}/${BOOST_NAME}) 48 set(BOOST_SOURCES_DIR ${CMAKE_BINARY_DIR}/${BOOST_NAME})
49
50 if (IS_DIRECTORY "${BOOST_SOURCES_DIR}")
51 set(FirstRun OFF)
52 else()
53 set(FirstRun ON)
54 endif()
49 55
50 DownloadPackage(${BOOST_MD5} ${BOOST_URL} "${BOOST_SOURCES_DIR}") 56 DownloadPackage(${BOOST_MD5} ${BOOST_URL} "${BOOST_SOURCES_DIR}")
51 57
52 58
53 ## 59 ##
76 82
77 set(BOOST_SOURCES 83 set(BOOST_SOURCES
78 ${BOOST_SOURCES_DIR}/libs/system/src/error_code.cpp 84 ${BOOST_SOURCES_DIR}/libs/system/src/error_code.cpp
79 ) 85 )
80 86
81 87 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
88 add_definitions(-DBOOST_SYSTEM_USE_STRERROR=1)
89
90 execute_process(
91 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
92 ${ORTHANC_ROOT}/Resources/Patches/boost-1.65.1-linux-standard-base.patch
93 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
94 RESULT_VARIABLE Failure
95 )
96
97 if (FirstRun AND Failure)
98 message(FATAL_ERROR "Error while patching a file")
99 endif()
100 endif()
101
102
82 ## 103 ##
83 ## Configuration of boost::thread 104 ## Configuration of boost::thread
84 ## 105 ##
85 106
86 if (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR 107 if (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR
197 ${BOOST_SOURCES_DIR}/libs/locale/src/util/gregorian.cpp 218 ${BOOST_SOURCES_DIR}/libs/locale/src/util/gregorian.cpp
198 ${BOOST_SOURCES_DIR}/libs/locale/src/util/info.cpp 219 ${BOOST_SOURCES_DIR}/libs/locale/src/util/info.cpp
199 ${BOOST_SOURCES_DIR}/libs/locale/src/util/locale_data.cpp 220 ${BOOST_SOURCES_DIR}/libs/locale/src/util/locale_data.cpp
200 ) 221 )
201 222
202 if (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR 223 if (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR
203 CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR 224 CMAKE_SYSTEM_VERSION STREQUAL "LinuxStandardBase")
204 CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR 225 list(APPEND BOOST_SOURCES
205 CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD" OR 226 ${BOOST_SOURCES_DIR}/libs/locale/src/std/codecvt.cpp
206 CMAKE_SYSTEM_NAME STREQUAL "PNaCl" OR 227 ${BOOST_SOURCES_DIR}/libs/locale/src/std/collate.cpp
207 CMAKE_SYSTEM_NAME STREQUAL "NaCl32" OR 228 ${BOOST_SOURCES_DIR}/libs/locale/src/std/converter.cpp
208 CMAKE_SYSTEM_NAME STREQUAL "NaCl64") 229 ${BOOST_SOURCES_DIR}/libs/locale/src/std/numeric.cpp
230 ${BOOST_SOURCES_DIR}/libs/locale/src/std/std_backend.cpp
231 )
232
233 add_definitions(
234 -DBOOST_LOCALE_WITH_ICONV=1
235 -DBOOST_LOCALE_NO_WINAPI_BACKEND=1
236 -DBOOST_LOCALE_NO_POSIX_BACKEND=1
237 )
238
239 elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR
240 CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR
241 CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR
242 CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD" OR
243 CMAKE_SYSTEM_NAME STREQUAL "PNaCl" OR
244 CMAKE_SYSTEM_NAME STREQUAL "NaCl32" OR
245 CMAKE_SYSTEM_NAME STREQUAL "NaCl64")
209 list(APPEND BOOST_SOURCES 246 list(APPEND BOOST_SOURCES
210 ${BOOST_SOURCES_DIR}/libs/locale/src/posix/codecvt.cpp 247 ${BOOST_SOURCES_DIR}/libs/locale/src/posix/codecvt.cpp
211 ${BOOST_SOURCES_DIR}/libs/locale/src/posix/collate.cpp 248 ${BOOST_SOURCES_DIR}/libs/locale/src/posix/collate.cpp
212 ${BOOST_SOURCES_DIR}/libs/locale/src/posix/converter.cpp 249 ${BOOST_SOURCES_DIR}/libs/locale/src/posix/converter.cpp
213 ${BOOST_SOURCES_DIR}/libs/locale/src/posix/numeric.cpp 250 ${BOOST_SOURCES_DIR}/libs/locale/src/posix/numeric.cpp
218 -DBOOST_LOCALE_WITH_ICONV=1 255 -DBOOST_LOCALE_WITH_ICONV=1
219 -DBOOST_LOCALE_NO_WINAPI_BACKEND=1 256 -DBOOST_LOCALE_NO_WINAPI_BACKEND=1
220 -DBOOST_LOCALE_NO_STD_BACKEND=1 257 -DBOOST_LOCALE_NO_STD_BACKEND=1
221 ) 258 )
222 259
223 elseif (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
224 list(APPEND BOOST_SOURCES
225 ${BOOST_SOURCES_DIR}/libs/locale/src/std/codecvt.cpp
226 ${BOOST_SOURCES_DIR}/libs/locale/src/std/collate.cpp
227 ${BOOST_SOURCES_DIR}/libs/locale/src/std/converter.cpp
228 ${BOOST_SOURCES_DIR}/libs/locale/src/std/numeric.cpp
229 ${BOOST_SOURCES_DIR}/libs/locale/src/std/std_backend.cpp
230 )
231
232 add_definitions(
233 -DBOOST_LOCALE_WITH_ICONV=1
234 -DBOOST_LOCALE_NO_WINAPI_BACKEND=1
235 -DBOOST_LOCALE_NO_POSIX_BACKEND=1
236 )
237
238 elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows") 260 elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
239 list(APPEND BOOST_SOURCES 261 list(APPEND BOOST_SOURCES
240 ${BOOST_SOURCES_DIR}/libs/locale/src/win32/collate.cpp 262 ${BOOST_SOURCES_DIR}/libs/locale/src/win32/collate.cpp
241 ${BOOST_SOURCES_DIR}/libs/locale/src/win32/converter.cpp 263 ${BOOST_SOURCES_DIR}/libs/locale/src/win32/converter.cpp
242 ${BOOST_SOURCES_DIR}/libs/locale/src/win32/lcid.cpp 264 ${BOOST_SOURCES_DIR}/libs/locale/src/win32/lcid.cpp