comparison Resources/CMake/BoostConfiguration.cmake @ 23:7a0af291cc90

Synchronization with Orthanc mainline
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 01 Jun 2015 11:52:28 +0200
parents 02f7a0400a91
children
comparison
equal deleted inserted replaced
22:b42eeb4bd1e3 23:7a0af291cc90
19 if (STATIC_BUILD OR NOT USE_SYSTEM_BOOST) 19 if (STATIC_BUILD OR NOT USE_SYSTEM_BOOST)
20 set(BOOST_STATIC 1) 20 set(BOOST_STATIC 1)
21 else() 21 else()
22 include(FindBoost) 22 include(FindBoost)
23 set(BOOST_STATIC 0) 23 set(BOOST_STATIC 0)
24 find_package(Boost COMPONENTS system thread filesystem) 24 find_package(Boost COMPONENTS system thread filesystem locale)
25 25
26 if (NOT Boost_FOUND) 26 if (NOT Boost_FOUND)
27 message(FATAL_ERROR "Unable to locate Boost on this system") 27 message(FATAL_ERROR "Unable to locate Boost on this system")
28 endif() 28 endif()
29 29
66 ${BOOST_SOURCES_DIR} 66 ${BOOST_SOURCES_DIR}
67 ) 67 )
68 68
69 list(APPEND BOOST_SOURCES 69 list(APPEND BOOST_SOURCES
70 ${BOOST_SOURCES_DIR}/libs/system/src/error_code.cpp 70 ${BOOST_SOURCES_DIR}/libs/system/src/error_code.cpp
71 ${BOOST_SOURCES_DIR}/libs/locale/src/encoding/codepage.cpp
71 ) 72 )
72 73
73 74
74 ## Boost::thread 75 ## Boost::thread
75 76
119 120
120 121
121 add_definitions( 122 add_definitions(
122 -DBOOST_HAS_FILESYSTEM_V3=1 123 -DBOOST_HAS_FILESYSTEM_V3=1
123 -DBOOST_HAS_LOCALE=1 124 -DBOOST_HAS_LOCALE=1
125 -DBOOST_HAS_DATE_TIME=0
126 -DBOOST_HAS_REGEX=0
124 ) 127 )