Skip to content

Commit 78f12ce

Browse files
committed
Fix CMake integration for Conan dependencies (GTest, benchmark)
1 parent f0e7366 commit 78f12ce

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

CMakeLists.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,17 @@ set(CMAKE_CXX_STANDARD 14)
55
set(CMAKE_CXX_STANDARD_REQUIRED ON)
66
set(CMAKE_CXX_EXTENSIONS OFF)
77

8+
# Include Conan dependencies if present
9+
if(EXISTS "${CMAKE_BINARY_DIR}/cmakedeps_macros.cmake")
10+
include("${CMAKE_BINARY_DIR}/cmakedeps_macros.cmake")
11+
endif()
12+
if(EXISTS "${CMAKE_BINARY_DIR}/GTestConfig.cmake")
13+
include("${CMAKE_BINARY_DIR}/GTestConfig.cmake")
14+
endif()
15+
if(EXISTS "${CMAKE_BINARY_DIR}/benchmark-config.cmake")
16+
include("${CMAKE_BINARY_DIR}/benchmark-config.cmake")
17+
endif()
18+
819
# Build options
920
option(AEC_BUILD_TESTS "Build tests" ON)
1021
option(AEC_BUILD_BENCHMARKS "Build benchmarks" ON)

benchmarks/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# Benchmarks CMakeLists.txt
2-
find_package(benchmark REQUIRED)
32

43
add_executable(aec_benchmark
54
aec_benchmark.cpp

tests/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# Tests CMakeLists.txt
2-
find_package(GTest REQUIRED)
32

43
add_executable(aec_tests
54
test_aec.cpp

0 commit comments

Comments
 (0)