Mercurial > hg > orthanc-webviewer
diff 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 |
line wrap: on
line diff
--- a/Resources/CMake/BoostConfiguration.cmake Fri May 29 11:07:38 2015 +0200 +++ b/Resources/CMake/BoostConfiguration.cmake Mon Jun 01 11:52:28 2015 +0200 @@ -21,7 +21,7 @@ else() include(FindBoost) set(BOOST_STATIC 0) - find_package(Boost COMPONENTS system thread filesystem) + find_package(Boost COMPONENTS system thread filesystem locale) if (NOT Boost_FOUND) message(FATAL_ERROR "Unable to locate Boost on this system") @@ -68,6 +68,7 @@ list(APPEND BOOST_SOURCES ${BOOST_SOURCES_DIR}/libs/system/src/error_code.cpp + ${BOOST_SOURCES_DIR}/libs/locale/src/encoding/codepage.cpp ) @@ -121,4 +122,6 @@ add_definitions( -DBOOST_HAS_FILESYSTEM_V3=1 -DBOOST_HAS_LOCALE=1 + -DBOOST_HAS_DATE_TIME=0 + -DBOOST_HAS_REGEX=0 )