Skip to content

Commit 4b0a74e

Browse files
Levi-ArmstrongLevi-Armstrong
committed
Remove old console bridge cmake target logic
1 parent 511e14b commit 4b0a74e

File tree

12 files changed

+4
-121
lines changed

12 files changed

+4
-121
lines changed

‎tesseract_command_language/CMakeLists.txt‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,6 @@ find_package(Eigen3 REQUIRED)
1515
find_package(Boost REQUIRED)
1616
find_package(cereal REQUIRED)
1717

18-
if(NOT TARGET console_bridge::console_bridge)
19-
add_library(console_bridge::console_bridge INTERFACE IMPORTED)
20-
set_target_properties(console_bridge::console_bridge PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
21-
${console_bridge_INCLUDE_DIRS})
22-
set_target_properties(console_bridge::console_bridge PROPERTIES INTERFACE_LINK_LIBRARIES ${console_bridge_LIBRARIES})
23-
else()
24-
get_target_property(CHECK_INCLUDE_DIRECTORIES console_bridge::console_bridge INTERFACE_INCLUDE_DIRECTORIES)
25-
if(NOT ${CHECK_INCLUDE_DIRECTORIES})
26-
set_target_properties(console_bridge::console_bridge PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
27-
${console_bridge_INCLUDE_DIRS})
28-
endif()
29-
endif()
30-
3118
# Load variable for clang tidy args, compiler options and cxx version
3219
tesseract_variables()
3320

@@ -92,8 +79,7 @@ configure_package(
9279
tesseract_common
9380
Eigen3
9481
Boost
95-
cereal
96-
CFG_EXTRAS cmake/tesseract_command_language-extras.cmake)
82+
cereal)
9783

9884
# Mark header files for installation
9985
install(

‎tesseract_command_language/cmake/tesseract_command_language-extras.cmake‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎tesseract_examples/CMakeLists.txt‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,6 @@ find_package(
2929
segmentation
3030
surface)
3131

32-
if(NOT TARGET console_bridge::console_bridge)
33-
add_library(console_bridge::console_bridge INTERFACE IMPORTED)
34-
set_target_properties(console_bridge::console_bridge PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
35-
${console_bridge_INCLUDE_DIRS})
36-
set_target_properties(console_bridge::console_bridge PROPERTIES INTERFACE_LINK_LIBRARIES ${console_bridge_LIBRARIES})
37-
else()
38-
get_target_property(CHECK_INCLUDE_DIRECTORIES console_bridge::console_bridge INTERFACE_INCLUDE_DIRECTORIES)
39-
if(NOT ${CHECK_INCLUDE_DIRECTORIES})
40-
set_target_properties(console_bridge::console_bridge PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
41-
${console_bridge_INCLUDE_DIRS})
42-
endif()
43-
endif()
44-
4532
# Load variable for clang tidy args, compiler options and cxx version
4633
tesseract_variables()
4734

‎tesseract_motion_planners/CMakeLists.txt‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,6 @@ find_package(tesseract_environment REQUIRED)
2020
find_package(tesseract_command_language REQUIRED)
2121
find_package(cereal REQUIRED)
2222

23-
if(NOT TARGET console_bridge::console_bridge)
24-
add_library(console_bridge::console_bridge INTERFACE IMPORTED)
25-
set_target_properties(console_bridge::console_bridge PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
26-
${console_bridge_INCLUDE_DIRS})
27-
set_target_properties(console_bridge::console_bridge PROPERTIES INTERFACE_LINK_LIBRARIES ${console_bridge_LIBRARIES})
28-
else()
29-
get_target_property(CHECK_INCLUDE_DIRECTORIES console_bridge::console_bridge INTERFACE_INCLUDE_DIRECTORIES)
30-
if(NOT ${CHECK_INCLUDE_DIRECTORIES})
31-
set_target_properties(console_bridge::console_bridge PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
32-
${console_bridge_INCLUDE_DIRS})
33-
endif()
34-
endif()
35-
3623
# Load variable for clang tidy args, compiler options and cxx version
3724
tesseract_variables()
3825

‎tesseract_motion_planners/core/CMakeLists.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ configure_component(
3535
tesseract_command_language
3636
console_bridge
3737
Threads
38-
Boost
39-
CFG_EXTRAS cmake/core-extras.cmake)
38+
Boost)
4039

4140
if(TESSERACT_PACKAGE)
4241
cpack_component(

‎tesseract_motion_planners/core/cmake/core-extras.cmake‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎tesseract_task_composer/CMakeLists.txt‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,6 @@ find_package(boost_plugin_loader REQUIRED)
1515
find_package(yaml-cpp REQUIRED)
1616
find_package(cereal REQUIRED)
1717

18-
if(NOT TARGET console_bridge::console_bridge)
19-
add_library(console_bridge::console_bridge INTERFACE IMPORTED)
20-
set_target_properties(console_bridge::console_bridge PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
21-
${console_bridge_INCLUDE_DIRS})
22-
set_target_properties(console_bridge::console_bridge PROPERTIES INTERFACE_LINK_LIBRARIES ${console_bridge_LIBRARIES})
23-
else()
24-
get_target_property(CHECK_INCLUDE_DIRECTORIES console_bridge::console_bridge INTERFACE_INCLUDE_DIRECTORIES)
25-
if(NOT ${CHECK_INCLUDE_DIRECTORIES})
26-
set_target_properties(console_bridge::console_bridge PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
27-
${console_bridge_INCLUDE_DIRS})
28-
endif()
29-
endif()
30-
3118
# Load variable for clang tidy args, compiler options and cxx version
3219
tesseract_variables()
3320

‎tesseract_task_composer/core/CMakeLists.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,7 @@ configure_component(
131131
tesseract_common
132132
boost_plugin_loader
133133
cereal
134-
yaml-cpp
135-
CFG_EXTRAS cmake/core-extras.cmake)
134+
yaml-cpp)
136135

137136
if(TESSERACT_PACKAGE)
138137
cpack_component(

‎tesseract_task_composer/core/cmake/core-extras.cmake‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎tesseract_time_parameterization/CMakeLists.txt‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,6 @@ find_package(tesseract_command_language REQUIRED)
1717
find_package(Eigen3 REQUIRED)
1818
find_package(cereal REQUIRED)
1919

20-
if(NOT TARGET console_bridge::console_bridge)
21-
add_library(console_bridge::console_bridge INTERFACE IMPORTED)
22-
set_target_properties(console_bridge::console_bridge PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
23-
${console_bridge_INCLUDE_DIRS})
24-
set_target_properties(console_bridge::console_bridge PROPERTIES INTERFACE_LINK_LIBRARIES ${console_bridge_LIBRARIES})
25-
else()
26-
get_target_property(CHECK_INCLUDE_DIRECTORIES console_bridge::console_bridge INTERFACE_INCLUDE_DIRECTORIES)
27-
if(NOT ${CHECK_INCLUDE_DIRECTORIES})
28-
set_target_properties(console_bridge::console_bridge PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
29-
${console_bridge_INCLUDE_DIRS})
30-
endif()
31-
endif()
32-
3320
# Load variable for clang tidy args, compiler options and cxx version
3421
tesseract_variables()
3522

0 commit comments

Comments
 (0)