Skip to content

Commit 48d81ed

Browse files
committed
Keep all the find_package calls on the toplevel CMakeLists
1 parent 50c24ad commit 48d81ed

File tree

2 files changed

+2
-18
lines changed

2 files changed

+2
-18
lines changed

cmake/ament_build.cmake

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@
22
set(CMAKE_CONFIG_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
33
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CONFIG_PATH}")
44

5-
if(BTCPP_GROOT_INTERFACE)
6-
find_package(ZeroMQ REQUIRED)
7-
endif()
8-
9-
if(BTCPP_SQLITE_LOGGING)
10-
find_package(SQLite3 REQUIRED)
11-
endif()
12-
135
find_package(ament_index_cpp REQUIRED)
146

157
set(BTCPP_EXTRA_INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIRS}

cmake/conan_build.cmake

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,19 @@
11
list(APPEND CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}")
22

3-
set(BUILDING_WITH_CONAN ON)
4-
53
if(BTCPP_GROOT_INTERFACE)
6-
find_package(ZeroMQ REQUIRED)
4+
# find_package(ZeroMQ REQUIRED)
75
list(APPEND BTCPP_EXTRA_LIBRARIES ${ZeroMQ_LIBRARIES})
86
list(APPEND BTCPP_EXTRA_INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIRS})
97
message(STATUS "ZeroMQ_LIBRARIES: ${ZeroMQ_LIBRARIES}")
108
endif()
119

1210
if(BTCPP_SQLITE_LOGGING)
13-
find_package(SQLite3 REQUIRED)
11+
# find_package(SQLite3 REQUIRED)
1412
list(APPEND BTCPP_EXTRA_LIBRARIES ${SQLite3_LIBRARIES})
1513
list(APPEND BTCPP_EXTRA_INCLUDE_DIRS ${SQLite3_INCLUDE_DIRS})
1614
message(STATUS "SQLite3_LIBRARIES: ${SQLite3_LIBRARIES}")
1715
endif()
1816

19-
20-
find_package(minicoro REQUIRED)
21-
find_package(minitrace REQUIRED)
22-
find_package(tinyxml2 REQUIRED)
23-
find_package(flatbuffers REQUIRED)
24-
2517
mark_as_advanced(
2618
BTCPP_EXTRA_LIBRARIES
2719
BTCPP_LIB_DESTINATION

0 commit comments

Comments
 (0)