work on boost

drexlerd · Jan 13, 2024 · 04002ca · 04002ca
1 parent 44f6716
commit 04002ca
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -70,15 +70,13 @@ configure_ccache()
 
 # set(CMAKE_FIND_DEBUG_MODE ON)
 
-set(DEPENDENCY_NAMES_LIST benchmark boost googletest)
-configure_dependencies("${DEPENDENCY_NAMES_LIST}")
-
 # Boost
 # Find Boost headers only according to https://cmake.org/cmake/help/latest/module/FindBoost.html
 configure_boost()
-find_package(Boost ${BOOST_MIN_VERSION} REQUIRED)
+find_package(Boost ${BOOST_MIN_VERSION} REQUIRED PATHS ${CMAKE_PREFIX_PATH}/boost NO_SYSTEM_ENVIRONMENT_PATH)
 if(Boost_FOUND)
   include_directories(${Boost_INCLUDE_DIRS})
+  message(STATUS "Found Boost: ${Boost_INCLUDE_DIRS} (found version \"${Boost_VERSION}\")")
 endif()
 
 

diff --git a/Config.cmake.in b/Config.cmake.in
@@ -19,10 +19,11 @@ include("${CMAKE_CURRENT_LIST_DIR}/cmake/configure_boost.cmake")
 # Boost
 # Find Boost headers only according to https://cmake.org/cmake/help/latest/module/FindBoost.html
 configure_boost()
-find_dependency(Boost ${BOOST_MIN_VERSION} REQUIRED PATHS "${PACKAGE_PREFIX_DIR}/boost")
+find_dependency(Boost ${BOOST_MIN_VERSION} REQUIRED PATHS "${PACKAGE_PREFIX_DIR}/boost" NO_SYSTEM_ENVIRONMENT_PATH)
 
 if(Boost_FOUND)
   include_directories(${Boost_INCLUDE_DIRS})
+  message(STATUS "Found Boost: ${Boost_INCLUDE_DIRS} (found version \"${Boost_VERSION}\")")
 endif()
 
 

diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(benchmark "1.8.3" REQUIRED)
+find_package(benchmark "1.8.3" REQUIRED PATHS ${CMAKE_PREFIX_PATH}/benchmark NO_SYSTEM_ENVIRONMENT_PATH)
 
 add_executable(construct_atoms "construct_atoms.cpp" "utils.cpp" "utils.hpp")
 target_link_libraries(construct_atoms loki::parsers)

diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
@@ -1,6 +1,6 @@
 enable_testing()
 
-find_package(GTest "1.11.0" REQUIRED)
+find_package(GTest "1.11.0" REQUIRED PATHS ${CMAKE_PREFIX_PATH}/googletest NO_SYSTEM_ENVIRONMENT_PATH)
 
 file(GLOB_RECURSE SRC_FILES
     "common/*.cpp" "common/**/*.cpp"