comparison 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
comparison
equal deleted inserted replaced
928:882833632b1f 930:27d256e0b458
6 set(BOOST_STATIC 0) 6 set(BOOST_STATIC 0)
7 #set(Boost_DEBUG 1) 7 #set(Boost_DEBUG 1)
8 #set(Boost_USE_STATIC_LIBS ON) 8 #set(Boost_USE_STATIC_LIBS ON)
9 9
10 find_package(Boost 10 find_package(Boost
11 COMPONENTS filesystem thread system date_time regex) 11 COMPONENTS filesystem thread system date_time regex locale)
12 12
13 if (NOT Boost_FOUND) 13 if (NOT Boost_FOUND)
14 message(FATAL_ERROR "Unable to locate Boost on this system") 14 message(FATAL_ERROR "Unable to locate Boost on this system")
15 endif() 15 endif()
16 16
53 ) 53 )
54 54
55 set(BOOST_SOURCES) 55 set(BOOST_SOURCES)
56 56
57 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR 57 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR
58 ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") 58 ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR
59 ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD")
59 list(APPEND BOOST_SOURCES 60 list(APPEND BOOST_SOURCES
60 ${BOOST_SOURCES_DIR}/libs/thread/src/pthread/once.cpp 61 ${BOOST_SOURCES_DIR}/libs/thread/src/pthread/once.cpp
61 ${BOOST_SOURCES_DIR}/libs/thread/src/pthread/thread.cpp 62 ${BOOST_SOURCES_DIR}/libs/thread/src/pthread/thread.cpp
62 ) 63 )
63 add_definitions( 64 add_definitions(
127 ) 128 )
128 129
129 source_group(ThirdParty\\Boost REGULAR_EXPRESSION ${BOOST_SOURCES_DIR}/.*) 130 source_group(ThirdParty\\Boost REGULAR_EXPRESSION ${BOOST_SOURCES_DIR}/.*)
130 else() 131 else()
131 add_definitions( 132 add_definitions(
132 -DBOOST_HAS_LOCALE=0 133 -DBOOST_HAS_LOCALE=1
133 ) 134 )
134 endif() 135 endif()