Mercurial > hg > orthanc
comparison Resources/CMake/BoostConfiguration.cmake @ 111:0fc3b69c0357
preparing for release
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 04 Oct 2012 12:45:24 +0200 |
parents | fd7b0a3e6260 |
children | baada606da3c |
comparison
equal
deleted
inserted
replaced
110:fd7b0a3e6260 | 111:0fc3b69c0357 |
---|---|
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 |
17 # Boost releases 1.44 through 1.47 supply both V2 and V3 filesystem | |
18 # http://www.boost.org/doc/libs/1_46_1/libs/filesystem/v3/doc/index.htm | |
19 if (${Boost_VERSION} LESS 104400) | |
20 add_definitions( | |
21 -DBOOST_HAS_FILESYSTEM_V3=0 | |
22 ) | |
23 else() | |
24 add_definitions( | |
25 -DBOOST_HAS_FILESYSTEM_V3=1 | |
26 -DBOOST_FILESYSTEM_VERSION=3 | |
27 ) | |
28 endif() | |
29 | |
17 #if (${Boost_VERSION} LESS 104800) | 30 #if (${Boost_VERSION} LESS 104800) |
18 # boost::locale is only available from 1.48.00 | 31 # boost::locale is only available from 1.48.00 |
19 #message("Too old version of Boost (${Boost_LIB_VERSION}): Building the static version") | 32 #message("Too old version of Boost (${Boost_LIB_VERSION}): Building the static version") |
20 # SET(BOOST_STATIC 1) | 33 # SET(BOOST_STATIC 1) |
21 #endif() | 34 #endif() |
22 | |
23 #add_definitions( | |
24 # -DBOOST_FILESYSTEM_VERSION=1 | |
25 # ) | |
26 | 35 |
27 include_directories(${Boost_INCLUDE_DIRS}) | 36 include_directories(${Boost_INCLUDE_DIRS}) |
28 link_libraries(${Boost_LIBRARIES}) | 37 link_libraries(${Boost_LIBRARIES}) |
29 endif() | 38 endif() |
30 | 39 |
93 | 102 |
94 source_group(ThirdParty\\Boost REGULAR_EXPRESSION ${BOOST_SOURCES_DIR}/.*) | 103 source_group(ThirdParty\\Boost REGULAR_EXPRESSION ${BOOST_SOURCES_DIR}/.*) |
95 else() | 104 else() |
96 add_definitions( | 105 add_definitions( |
97 -DBOOST_HAS_LOCALE=0 | 106 -DBOOST_HAS_LOCALE=0 |
98 -DBOOST_HAS_FILESYSTEM_V3=0 | |
99 ) | 107 ) |
100 endif() | 108 endif() |