From c2e8eabc2f8aaeeefc34bc3d3aea8e84d6016f06 Mon Sep 17 00:00:00 2001 From: Feda Curic Date: Thu, 7 Oct 2021 12:11:54 +0200 Subject: [PATCH] Use built in FindBoost --- CMakeLists.txt | 3 +- cmake/Modules/BoostTargets.cmake | 49 -------------------------------- 2 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 cmake/Modules/BoostTargets.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index cdb93005a..667951199 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,8 +109,7 @@ macro (config_hook) set(HAVE_ECL_OUTPUT 1)") endif() - # Configure boost targets for old cmake - include(cmake/Modules/BoostTargets.cmake) + find_package(Boost COMPONENTS filesystem regex system unit_test_framework) if (HAVE_DYNAMIC_BOOST_TEST) set_target_properties(Boost::unit_test_framework PROPERTIES INTERFACE_COMPILE_DEFINITIONS BOOST_TEST_DYN_LINK=1) diff --git a/cmake/Modules/BoostTargets.cmake b/cmake/Modules/BoostTargets.cmake deleted file mode 100644 index abbf8f5fc..000000000 --- a/cmake/Modules/BoostTargets.cmake +++ /dev/null @@ -1,49 +0,0 @@ -# make targets for boost if find module did not do the job - -if(NOT TARGET Boost::system) - add_library(Boost::system UNKNOWN IMPORTED) - set_target_properties(Boost::system PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}" - INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}" - IMPORTED_LOCATION "${Boost_SYSTEM_LIBRARY}" - IMPORTED_LOCATION_DEBUG "${Boost_SYSTEM_LIBRARY_DEBUG}" - IMPORTED_LOCATION_RELEASE "${Boost_SYSTEM_LIBRARY_RELEASE}" - ) -endif() - -if(NOT TARGET Boost::filesystem) - add_library(Boost::filesystem UNKNOWN IMPORTED) - set_target_properties(Boost::filesystem PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}" - INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}" - INTERFACE_COMPILE_DEFINITIONS BOOST_FILESYSTEM_VERSION=3 - INTERFACE_LINK_LIBRARIES "${boost_system}" - IMPORTED_LOCATION "${Boost_FILESYSTEM_LIBRARY}" - IMPORTED_LOCATION_DEBUG "${Boost_FILESYSTEM_LIBRARY_DEBUG}" - IMPORTED_LOCATION_RELEASE "${Boost_FILESYSTEM_LIBRARY_RELEASE}" - ) -endif() - -if(NOT TARGET Boost::regex) - add_library(Boost::regex UNKNOWN IMPORTED) - set_target_properties(Boost::regex PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}" - INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}" - INTERFACE_LINK_LIBRARIES "${boost_system}" - IMPORTED_LOCATION "${Boost_REGEX_LIBRARY}" - IMPORTED_LOCATION_DEBUG "${Boost_REGEX_LIBRARY_DEBUG}" - IMPORTED_LOCATION_RELEASE "${Boost_REGEX_LIBRARY_RELEASE}" - ) -endif() - -if(NOT TARGET Boost::unit_test_framework) - add_library(Boost::unit_test_framework UNKNOWN IMPORTED) - set_target_properties(Boost::unit_test_framework PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}" - INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}" - INTERFACE_LINK_LIBRARIES "${boost_system}" - IMPORTED_LOCATION "${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}" - IMPORTED_LOCATION_DEBUG "${Boost_UNIT_TEST_FRAMEWORK_LIBRARY_DEBUG}" - IMPORTED_LOCATION_RELEASE "${Boost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE}" - ) -endif()