Skip to content

Commit 50c24ad

Browse files
committed
This was shared across both code paths, conan_build.cmake and ament_build.cmake
So it is better to keep this on a single place
1 parent 7eda756 commit 50c24ad

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ option(USE_VENDORED_MINITRACE "Use the bundled version of minitrace" ON)
2828
option(USE_VENDORED_TINYXML2 "Use the bundled version of tinyxml2" ON)
2929
option(USE_VENDORED_WILDCARDS "Use the bundled version of wildcards" ON)
3030

31+
set(BTCPP_LIB_DESTINATION lib)
32+
set(BTCPP_INCLUDE_DESTINATION include)
33+
set(BTCPP_BIN_DESTINATION bin)
34+
3135
set(BASE_FLAGS "")
3236

3337
if(ENABLE_DEBUG)

cmake/ament_build.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ set( BTCPP_EXTRA_LIBRARIES
2323

2424
ament_export_dependencies(ament_index_cpp)
2525

26-
set( BTCPP_LIB_DESTINATION lib )
27-
set( BTCPP_INCLUDE_DESTINATION include )
28-
set( BTCPP_BIN_DESTINATION bin )
29-
3026
mark_as_advanced(
3127
BTCPP_EXTRA_LIBRARIES
3228
BTCPP_EXTRA_INCLUDE_DIRS

cmake/conan_build.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ if(BTCPP_SQLITE_LOGGING)
1717
endif()
1818

1919

20-
set( BTCPP_LIB_DESTINATION lib )
21-
set( BTCPP_INCLUDE_DESTINATION include )
22-
set( BTCPP_BIN_DESTINATION bin )
23-
2420
find_package(minicoro REQUIRED)
2521
find_package(minitrace REQUIRED)
2622
find_package(tinyxml2 REQUIRED)

0 commit comments

Comments
 (0)