Compare commits
1 Commits
948405bba4
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 727233624e |
@@ -15,8 +15,6 @@ set(CMAKE_CXX_STANDARD 17)
|
|||||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||||
|
|
||||||
# Find dependencies
|
|
||||||
find_package(console_bridge REQUIRED)
|
|
||||||
|
|
||||||
if (NOT BUILDING_WITH_CATKIN)
|
if (NOT BUILDING_WITH_CATKIN)
|
||||||
|
|
||||||
@@ -38,13 +36,11 @@ else()
|
|||||||
catkin_package(
|
catkin_package(
|
||||||
INCLUDE_DIRS include
|
INCLUDE_DIRS include
|
||||||
LIBRARIES ${PROJECT_NAME}
|
LIBRARIES ${PROJECT_NAME}
|
||||||
DEPENDS console_bridge
|
|
||||||
)
|
)
|
||||||
|
|
||||||
include_directories(
|
include_directories(
|
||||||
include
|
include
|
||||||
${catkin_INCLUDE_DIRS}
|
${catkin_INCLUDE_DIRS}
|
||||||
${console_bridge_INCLUDE_DIRS}
|
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@@ -72,7 +68,6 @@ if(BUILDING_WITH_CATKIN)
|
|||||||
|
|
||||||
target_link_libraries(${PROJECT_NAME}
|
target_link_libraries(${PROJECT_NAME}
|
||||||
PUBLIC ${catkin_LIBRARIES}
|
PUBLIC ${catkin_LIBRARIES}
|
||||||
PRIVATE console_bridge::console_bridge
|
|
||||||
)
|
)
|
||||||
|
|
||||||
else()
|
else()
|
||||||
@@ -83,10 +78,9 @@ else()
|
|||||||
$<INSTALL_INTERFACE:include>
|
$<INSTALL_INTERFACE:include>
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(${PROJECT_NAME}
|
# target_link_libraries(${PROJECT_NAME}
|
||||||
PUBLIC
|
|
||||||
console_bridge::console_bridge
|
# )
|
||||||
)
|
|
||||||
|
|
||||||
set_target_properties(${PROJECT_NAME} PROPERTIES
|
set_target_properties(${PROJECT_NAME} PROPERTIES
|
||||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
|
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
|
||||||
@@ -145,6 +139,5 @@ else()
|
|||||||
message(STATUS "Project: ${PROJECT_NAME}")
|
message(STATUS "Project: ${PROJECT_NAME}")
|
||||||
message(STATUS "Version: ${PROJECT_VERSION}")
|
message(STATUS "Version: ${PROJECT_VERSION}")
|
||||||
message(STATUS "C++ Standard: ${CMAKE_CXX_STANDARD}")
|
message(STATUS "C++ Standard: ${CMAKE_CXX_STANDARD}")
|
||||||
message(STATUS "Dependencies: console_bridge")
|
|
||||||
message(STATUS "=================================")
|
message(STATUS "=================================")
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
Reference in New Issue
Block a user