diff options
Diffstat (limited to 'src/3rd_party/CMakeLists.txt')
| -rw-r--r-- | src/3rd_party/CMakeLists.txt | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/3rd_party/CMakeLists.txt b/src/3rd_party/CMakeLists.txt index 6c70e8988b..3072462ec4 100644 --- a/src/3rd_party/CMakeLists.txt +++ b/src/3rd_party/CMakeLists.txt @@ -209,11 +209,12 @@ else() ) endif() +set(BOOST_ROOT ${3RD_PARTY_INSTALL_PREFIX}) +set(BOOST_LIBRARYDIR ${3RD_PARTY_INSTALL_PREFIX}/lib) +set(BOOST_INCLUDEDIR ${3RD_PARTY_INSTALL_PREFIX}/include) find_package(Boost 1.66.0 COMPONENTS system thread) set(BOOST_LIB_SOURCE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/boost_src) -set(BOOST_LIBS_DIRECTORY ${3RD_PARTY_INSTALL_PREFIX}/lib) -SET_PROPERTY(GLOBAL PROPERTY GLOBAL_BOOST_LIBS ${BOOST_LIBS_DIRECTORY}) -set(BOOST_INCLUDE_DIRECTORY ${3RD_PARTY_INSTALL_PREFIX}/include ) +SET_PROPERTY(GLOBAL PROPERTY GLOBAL_BOOST_LIBS ${BOOST_LIBRARYDIR}) if (NOT ${Boost_FOUND}) message(STATUS "Did not find boost. Downloading and installing boost 1.66") set(BOOST_INSTALL_COMMAND ./b2 install) @@ -232,11 +233,8 @@ if (NOT ${Boost_FOUND}) INSTALL_DIR ${3RD_PARTY_INSTALL_PREFIX} BUILD_IN_SOURCE true ) - - set(BOOST_INCLUDE_DIR ${BOOST_ROOT_DIR}/Boost-prefix/src/Boost) - set(BOOST_LIB_DIR ${BOOST_ROOT_DIR}/Boost-prefix/src/Boost/stage/lib/) else() -add_custom_target(Boost) # empty target, Boost is already installed + add_custom_target(Boost) # empty target, Boost is already installed endif() add_custom_target(install-3rd_party |