diff --git a/CMakeLists.txt b/CMakeLists.txt index cf4676f0..ca85a5bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,23 +94,26 @@ add_definitions(${CLANG_DEFINITIONS}) # Boost ------------------------------------------------------------------------ +set(Boost_USE_MULTITHREAD ON) +set(Boost_USE_STATIC_LIBS ON) +set(Boost_USE_STATIC_RUNTIME OFF) +set(BOOST_LIBRARYDIR $ENV{BOOST_159_DIR}) + if(UNIX AND NOT APPLE) set(BOOST_ROOT $ENV{BOOST_DIR}) elseif(UNIX AND APPLE) set(BOOST_ROOT $ENV{BOOST_159_DIR}) set(Boost_NO_SYSTEM_PATHS ON) else() + STRING(REGEX REPLACE "\\\\" "/" BOOST_LIBRARYDIR ${BOOST_LIBRARYDIR}) + if(${WINXXBITS} STREQUAL "Win32") - set(BOOST_ROOT "$ENV{BOOST_159_DIR}/win32") + set(BOOST_ROOT "${BOOST_LIBRARYDIR}/win32") else() - set(BOOST_ROOT "$ENV{BOOST_159_DIR}/win64") + set(BOOST_ROOT "${BOOST_LIBRARYDIR}/win64") endif() set(Boost_NO_SYSTEM_PATHS ON) endif() -set(Boost_USE_MULTITHREAD ON) -set(Boost_USE_STATIC_LIBS ON) -set(Boost_USE_STATIC_RUNTIME OFF) -set(BOOST_LIBRARYDIR $ENV{BOOST_159_DIR}) find_package(Boost 1.59 COMPONENTS system program_options filesystem date_time REQUIRED)