Mercurial > hg > orthanc
diff Resources/CMake/BoostConfiguration.cmake @ 624:b58d65608949
integration find-move-scp -> mainline
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 25 Oct 2013 12:42:38 +0200 |
parents | 5ba825b87b21 |
children | b8322fe3bdba |
line wrap: on
line diff
--- a/Resources/CMake/BoostConfiguration.cmake Fri Oct 25 10:36:06 2013 +0200 +++ b/Resources/CMake/BoostConfiguration.cmake Fri Oct 25 12:42:38 2013 +0200 @@ -1,14 +1,14 @@ if (${STATIC_BUILD}) - SET(BOOST_STATIC 1) + set(BOOST_STATIC 1) else() include(FindBoost) - SET(BOOST_STATIC 0) + set(BOOST_STATIC 0) #set(Boost_DEBUG 1) #set(Boost_USE_STATIC_LIBS ON) find_package(Boost - COMPONENTS filesystem thread system date_time) + COMPONENTS filesystem thread system date_time regex) if (NOT Boost_FOUND) message(FATAL_ERROR "Unable to locate Boost on this system") @@ -30,7 +30,7 @@ #if (${Boost_VERSION} LESS 104800) # boost::locale is only available from 1.48.00 #message("Too old version of Boost (${Boost_LIB_VERSION}): Building the static version") - # SET(BOOST_STATIC 1) + # set(BOOST_STATIC 1) #endif() include_directories(${Boost_INCLUDE_DIRS}) @@ -40,12 +40,12 @@ if (BOOST_STATIC) # Parameters for Boost 1.54.0 - SET(BOOST_NAME boost_1_54_0) - SET(BOOST_BCP_SUFFIX bcpdigest-0.6.2) - SET(BOOST_MD5 "a464288a976ba133f9b325f454cb503d") - SET(BOOST_FILESYSTEM_SOURCES_DIR "${BOOST_NAME}/libs/filesystem/src") + set(BOOST_NAME boost_1_54_0) + set(BOOST_BCP_SUFFIX bcpdigest-0.6.2) + set(BOOST_MD5 "a464288a976ba133f9b325f454cb503d") + set(BOOST_FILESYSTEM_SOURCES_DIR "${BOOST_NAME}/libs/filesystem/src") - SET(BOOST_SOURCES_DIR ${CMAKE_BINARY_DIR}/${BOOST_NAME}) + set(BOOST_SOURCES_DIR ${CMAKE_BINARY_DIR}/${BOOST_NAME}) DownloadPackage( "${BOOST_MD5}" "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/${BOOST_NAME}_${BOOST_BCP_SUFFIX}.tar.gz" @@ -80,7 +80,10 @@ message(FATAL_ERROR "Support your platform here") endif() + aux_source_directory(${BOOST_SOURCES_DIR}/libs/regex/src BOOST_REGEX_SOURCES) + list(APPEND BOOST_SOURCES + ${BOOST_REGEX_SOURCES} ${BOOST_SOURCES_DIR}/libs/date_time/src/gregorian/greg_month.cpp ${BOOST_FILESYSTEM_SOURCES_DIR}/codecvt_error_category.cpp ${BOOST_FILESYSTEM_SOURCES_DIR}/operations.cpp