From cfc4e0b65d247cd72d866a296353428c5ba7dc7d Mon Sep 17 00:00:00 2001 From: Oliver Schmitz Date: Fri, 3 Nov 2023 17:30:04 +0100 Subject: [PATCH] Disabled dependency on Boost timer --- environment/cmake/FernConfiguration.cmake | 6 +++--- fern-config.cmake | 7 ++++--- source/fern/core/CMakeLists.txt | 6 +++--- source/fern/core/test/CMakeLists.txt | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/environment/cmake/FernConfiguration.cmake b/environment/cmake/FernConfiguration.cmake index ec0f9a05..c04a3c42 100644 --- a/environment/cmake/FernConfiguration.cmake +++ b/environment/cmake/FernConfiguration.cmake @@ -82,7 +82,7 @@ endif() if(FERN_BUILD_ALGORITHM) # Required third party software. set(DEVBASE_BOOST_REQUIRED TRUE) - list(APPEND DEVBASE_REQUIRED_BOOST_COMPONENTS timer) + # list(APPEND DEVBASE_REQUIRED_BOOST_COMPONENTS timer) # Required Fern targets. set(FERN_FERN_ALGORITHM_REQUIRED TRUE) @@ -112,7 +112,7 @@ endif() if(FERN_BUILD_IO) # Required third party software. set(DEVBASE_BOOST_REQUIRED TRUE) - list(APPEND DEVBASE_REQUIRED_BOOST_COMPONENTS timer) + # list(APPEND DEVBASE_REQUIRED_BOOST_COMPONENTS timer) if(FERN_IO_WITH_GDAL) set(DEVBASE_GDAL_REQUIRED TRUE) endif() @@ -140,7 +140,7 @@ endif() if(FERN_BUILD_LANGUAGE) # Required third party software. set(DEVBASE_BOOST_REQUIRED TRUE) - list(APPEND DEVBASE_REQUIRED_BOOST_COMPONENTS timer) + # list(APPEND DEVBASE_REQUIRED_BOOST_COMPONENTS timer) set(DEVBASE_EXPAT_REQUIRED TRUE) set(DEVBASE_LOKI_REQUIRED TRUE) set(DEVBASE_PYTHON_LIBS_REQUIRED TRUE) diff --git a/fern-config.cmake b/fern-config.cmake index 8820a976..2627f4f4 100644 --- a/fern-config.cmake +++ b/fern-config.cmake @@ -1,9 +1,10 @@ include(CMakeFindDependencyMacro) find_dependency(Boost COMPONENTS - filesystem - system - timer + # filesystem + # system + # timer + headers ) find_dependency(Threads) include("${CMAKE_CURRENT_LIST_DIR}/fern_targets.cmake") diff --git a/source/fern/core/CMakeLists.txt b/source/fern/core/CMakeLists.txt index ed482adb..ccf336a2 100644 --- a/source/fern/core/CMakeLists.txt +++ b/source/fern/core/CMakeLists.txt @@ -12,7 +12,7 @@ add_library(fern_core path.cc script_error.cc stack.cc - stopwatch.cc + # stopwatch.cc string.cc thread_pool.cc type_traits.cc @@ -30,8 +30,8 @@ target_include_directories(fern_core ) target_link_libraries(fern_core - PUBLIC - Boost::timer + # PUBLIC + # Boost::timer PRIVATE $<$,$>:Threads::Threads> ) diff --git a/source/fern/core/test/CMakeLists.txt b/source/fern/core/test/CMakeLists.txt index 81f0820c..ce1fa9ca 100644 --- a/source/fern/core/test/CMakeLists.txt +++ b/source/fern/core/test/CMakeLists.txt @@ -11,7 +11,7 @@ add_unit_tests( scope_test.cc stack_test.cc std_test.cc - stopwatch_test.cc + # stopwatch_test.cc string_test.cc type_traits_test.cc typelist_test.cc