Mercurial > hg > orthanc
diff Resources/CMake/BoostConfiguration.cmake @ 930:27d256e0b458 mac
integration mainline -> mac
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 24 Jun 2014 16:47:18 +0200 |
| parents | 882833632b1f 703bef350e89 |
| children | 1b905ad6c913 |
line wrap: on
line diff
--- a/Resources/CMake/BoostConfiguration.cmake Wed Apr 16 17:02:07 2014 +0200 +++ b/Resources/CMake/BoostConfiguration.cmake Tue Jun 24 16:47:18 2014 +0200 @@ -8,7 +8,7 @@ #set(Boost_USE_STATIC_LIBS ON) find_package(Boost - COMPONENTS filesystem thread system date_time regex) + COMPONENTS filesystem thread system date_time regex locale) if (NOT Boost_FOUND) message(FATAL_ERROR "Unable to locate Boost on this system") @@ -55,7 +55,8 @@ set(BOOST_SOURCES) if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR - ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR + ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD") list(APPEND BOOST_SOURCES ${BOOST_SOURCES_DIR}/libs/thread/src/pthread/once.cpp ${BOOST_SOURCES_DIR}/libs/thread/src/pthread/thread.cpp @@ -129,6 +130,6 @@ source_group(ThirdParty\\Boost REGULAR_EXPRESSION ${BOOST_SOURCES_DIR}/.*) else() add_definitions( - -DBOOST_HAS_LOCALE=0 + -DBOOST_HAS_LOCALE=1 ) endif()