Skip to content

Commit

Permalink
Use a more reliable method to select buildtool
Browse files Browse the repository at this point in the history
  • Loading branch information
paulbovbel committed Jun 21, 2023
1 parent 5ab3a62 commit 461a690
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ cmake_minimum_required(VERSION 3.5)

PROJECT(plotjuggler_ros)

# http://answers.ros.org/question/230877/optionally-build-a-package-with-catkin/
if( CATKIN_DEVEL_PREFIX OR catkin_FOUND OR CATKIN_BUILD_BINARY_PACKAGE)
find_package(ament_cmake QUIET)
find_package(catkin QUIET)

if(catkin_FOUND)
set(COMPILING_WITH_CATKIN 1)

message(STATUS "---------------------------------------------------------------------")
Expand All @@ -28,9 +30,9 @@ if( CATKIN_DEVEL_PREFIX OR catkin_FOUND OR CATKIN_BUILD_BINARY_PACKAGE)
catkin_package(
CATKIN_DEPENDS ${ROS_DEPENDENCIES} )

elseif( DEFINED ENV{AMENT_PREFIX_PATH})
elseif(ament_cmake_FOUND)
set(COMPILING_WITH_AMENT 1)

message(STATUS "---------------------------------------------------------------------")
message(STATUS "PlotJuggler is being built using AMENT. ROS2 plugins will be compiled")
message(STATUS "---------------------------------------------------------------------")
Expand All @@ -53,7 +55,7 @@ elseif( DEFINED ENV{AMENT_PREFIX_PATH})
# find_package(pal_statistics_msgs REQUIRED)

else()
message(FATAL_ERROR "PlotJuggler is being WITHOUT any ROS support")
message(FATAL_ERROR "Cannot determine appropriate ROS build system")
endif()

cmake_policy (SET CMP0020 NEW)
Expand Down Expand Up @@ -135,7 +137,7 @@ elseif(COMPILING_WITH_AMENT)

install(DIRECTORY launch
DESTINATION share/${PROJECT_NAME})

else()
set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
Expand All @@ -149,4 +151,3 @@ add_subdirectory( plugins )
if(COMPILING_WITH_AMENT)
ament_package()
endif()

0 comments on commit 461a690

Please sign in to comment.