Mercurial > hg > orthanc
comparison Resources/CMake/BoostConfiguration.cmake @ 1473:0631b56c35eb
Update to Boost 1.58.0 for static and Windows builds
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 31 Jul 2015 11:10:27 +0200 |
parents | 728c22ade2e2 |
children | fbf763bb1fa3 |
comparison
equal
deleted
inserted
replaced
1472:237d83694d82 | 1473:0631b56c35eb |
---|---|
37 link_libraries(${Boost_LIBRARIES}) | 37 link_libraries(${Boost_LIBRARIES}) |
38 endif() | 38 endif() |
39 | 39 |
40 | 40 |
41 if (BOOST_STATIC) | 41 if (BOOST_STATIC) |
42 # Parameters for Boost 1.55.0 | 42 # Parameters for Boost 1.58.0 |
43 set(BOOST_NAME boost_1_55_0) | 43 set(BOOST_NAME boost_1_58_0) |
44 set(BOOST_BCP_SUFFIX bcpdigest-0.7.4) | 44 set(BOOST_BCP_SUFFIX bcpdigest-0.9.2) |
45 set(BOOST_MD5 "409f7a0e4fb1f5659d07114f3133b67b") | 45 set(BOOST_MD5 "704b110917cbda903e07cb53934b47ac") |
46 set(BOOST_FILESYSTEM_SOURCES_DIR "${BOOST_NAME}/libs/filesystem/src") | 46 set(BOOST_FILESYSTEM_SOURCES_DIR "${BOOST_NAME}/libs/filesystem/src") |
47 | 47 |
48 set(BOOST_SOURCES_DIR ${CMAKE_BINARY_DIR}/${BOOST_NAME}) | 48 set(BOOST_SOURCES_DIR ${CMAKE_BINARY_DIR}/${BOOST_NAME}) |
49 DownloadPackage( | 49 DownloadPackage( |
50 "${BOOST_MD5}" | 50 "${BOOST_MD5}" |
97 list(APPEND BOOST_SOURCES | 97 list(APPEND BOOST_SOURCES |
98 ${BOOST_SOURCES_DIR}/libs/filesystem/src/utf8_codecvt_facet.cpp | 98 ${BOOST_SOURCES_DIR}/libs/filesystem/src/utf8_codecvt_facet.cpp |
99 ) | 99 ) |
100 endif() | 100 endif() |
101 | 101 |
102 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") | |
103 # This is a patch to compile Boost 1.55.0 with Clang 3.4 and later | |
104 # (including XCode 5.1). Fixes issue 14 of Orthanc. | |
105 # https://trac.macports.org/ticket/42282#comment:10 | |
106 execute_process( | |
107 COMMAND patch -p0 -N -i ${ORTHANC_ROOT}/Resources/Patches/boost-1.55.0-clang-atomic.patch | |
108 WORKING_DIRECTORY ${BOOST_SOURCES_DIR} | |
109 ) | |
110 endif() | |
111 | |
112 aux_source_directory(${BOOST_SOURCES_DIR}/libs/regex/src BOOST_REGEX_SOURCES) | 102 aux_source_directory(${BOOST_SOURCES_DIR}/libs/regex/src BOOST_REGEX_SOURCES) |
113 | 103 |
114 list(APPEND BOOST_SOURCES | 104 list(APPEND BOOST_SOURCES |
115 ${BOOST_REGEX_SOURCES} | 105 ${BOOST_REGEX_SOURCES} |
116 ${BOOST_SOURCES_DIR}/libs/date_time/src/gregorian/greg_month.cpp | 106 ${BOOST_SOURCES_DIR}/libs/date_time/src/gregorian/greg_month.cpp |