From b0ac332d58cc7d7e2da4ba26efc2f3416c674784 Mon Sep 17 00:00:00 2001 From: Naios Date: Mon, 14 Mar 2016 15:27:33 +0100 Subject: CMake: Provide proper interface targets from dependencies * to make use of cmakes inherited link dependencies which imports all include directories/ definitions from the link library (cherry picked from commit 1a572d242593124f986d3ed08710b96a142a6763) --- cmake/macros/ConfigureBoost.cmake | 49 --------------------------------------- 1 file changed, 49 deletions(-) delete mode 100644 cmake/macros/ConfigureBoost.cmake (limited to 'cmake/macros/ConfigureBoost.cmake') diff --git a/cmake/macros/ConfigureBoost.cmake b/cmake/macros/ConfigureBoost.cmake deleted file mode 100644 index 3db9fc54a8c..00000000000 --- a/cmake/macros/ConfigureBoost.cmake +++ /dev/null @@ -1,49 +0,0 @@ -if(WIN32) - set(BOOST_DEBUG ON) - if(DEFINED ENV{BOOST_ROOT}) - set(BOOST_ROOT $ENV{BOOST_ROOT}) - if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0) - set(BOOST_LIBRARYDIR ${BOOST_ROOT}/lib${PLATFORM}-msvc-12.0) - else() - set(BOOST_LIBRARYDIR ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.0) - endif() - else() - message(FATAL_ERROR "No BOOST_ROOT environment variable could be found! Please make sure it is set and the points to your Boost installation.") - endif() - - set(Boost_USE_STATIC_LIBS ON) - set(Boost_USE_MULTITHREADED ON) - set(Boost_USE_STATIC_RUNTIME OFF) - - add_definitions(-D_WIN32_WINNT=0x0601) -endif() - -find_package(Boost 1.51 REQUIRED system filesystem thread program_options iostreams regex) -add_definitions(-DBOOST_DATE_TIME_NO_LIB) -add_definitions(-DBOOST_REGEX_NO_LIB) -add_definitions(-DBOOST_CHRONO_NO_LIB) - -# Find if Boost was compiled in C++03 mode because it requires -DBOOST_NO_CXX11_SCOPED_ENUMS - -include (CheckCXXSourceCompiles) - -set(CMAKE_REQUIRED_INCLUDES ${Boost_INCLUDE_DIR}) -set(CMAKE_REQUIRED_LIBRARIES ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_IOSTREAMS_LIBRARY}) -set(CMAKE_REQUIRED_FLAGS "-std=c++11") -unset(boost_filesystem_copy_links_without_NO_SCOPED_ENUM CACHE) -check_cxx_source_compiles(" - #include - #include - int main() { boost::filesystem::copy_file(boost::filesystem::path(), boost::filesystem::path()); }" -boost_filesystem_copy_links_without_NO_SCOPED_ENUM) -unset(CMAKE_REQUIRED_INCLUDES CACHE) -unset(CMAKE_REQUIRED_LIBRARIES CACHE) -unset(CMAKE_REQUIRED_FLAGS CACHE) - -if (NOT boost_filesystem_copy_links_without_NO_SCOPED_ENUM) - add_definitions(-DBOOST_NO_CXX11_SCOPED_ENUMS) -endif() - -if(Boost_FOUND) - include_directories(${Boost_INCLUDE_DIRS}) -endif() -- cgit v1.2.3