Skip to content

Commit

Permalink
Bump CMake version to prevent CMP0048
Browse files Browse the repository at this point in the history
  • Loading branch information
matthew-reynolds authored and bmagyar committed Apr 15, 2020
1 parent 57069cc commit d454fa4
Show file tree
Hide file tree
Showing 14 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion ackermann_steering_controller/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(ackermann_steering_controller)

# Default to C++14
Expand Down
2 changes: 1 addition & 1 deletion diff_drive_controller/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(diff_drive_controller)

# Default to C++14
Expand Down
2 changes: 1 addition & 1 deletion effort_controllers/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(effort_controllers)

# Default to C++14
Expand Down
4 changes: 2 additions & 2 deletions force_torque_sensor_controller/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(force_torque_sensor_controller)

# Default to C++14
Expand Down Expand Up @@ -32,7 +32,7 @@ catkin_package(
include_directories(include ${Boost_INCLUDE_DIR} ${catkin_INCLUDE_DIRS})

add_library(${PROJECT_NAME}
src/force_torque_sensor_controller.cpp
src/force_torque_sensor_controller.cpp
include/force_torque_sensor_controller/force_torque_sensor_controller.h
)
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES})
Expand Down
2 changes: 1 addition & 1 deletion forward_command_controller/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(forward_command_controller)

# Default to C++14
Expand Down
2 changes: 1 addition & 1 deletion four_wheel_steering_controller/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(four_wheel_steering_controller)

# Default to C++14
Expand Down
16 changes: 8 additions & 8 deletions gripper_action_controller/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(gripper_action_controller)

# Default to C++14
if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 14)
endif()

find_package(catkin
find_package(catkin
REQUIRED COMPONENTS
actionlib
angles
Expand All @@ -27,12 +27,12 @@ find_package(catkin
catkin_package(
INCLUDE_DIRS include
LIBRARIES gripper_action_controller
CATKIN_DEPENDS
actionlib
cmake_modules
controller_interface
control_msgs
hardware_interface
CATKIN_DEPENDS
actionlib
cmake_modules
controller_interface
control_msgs
hardware_interface
realtime_tools
trajectory_msgs
)
Expand Down
6 changes: 3 additions & 3 deletions imu_sensor_controller/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(imu_sensor_controller)

# Default to C++14
Expand All @@ -16,7 +16,7 @@ find_package(catkin REQUIRED COMPONENTS
)

catkin_package(
CATKIN_DEPENDS
CATKIN_DEPENDS
controller_interface
hardware_interface
pluginlib
Expand All @@ -30,7 +30,7 @@ catkin_package(
include_directories(include ${Boost_INCLUDE_DIR} ${catkin_INCLUDE_DIRS})

add_library(${PROJECT_NAME}
src/imu_sensor_controller.cpp
src/imu_sensor_controller.cpp
include/imu_sensor_controller/imu_sensor_controller.h)
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES})

Expand Down
2 changes: 1 addition & 1 deletion joint_state_controller/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(joint_state_controller)

# Default to C++14
Expand Down
2 changes: 1 addition & 1 deletion joint_trajectory_controller/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(joint_trajectory_controller)

# Default to C++14
Expand Down
2 changes: 1 addition & 1 deletion position_controllers/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(position_controllers)

# Load catkin and all dependencies required for this package
Expand Down
2 changes: 1 addition & 1 deletion ros_controllers/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(ros_controllers)
find_package(catkin REQUIRED)
catkin_metapackage()
2 changes: 1 addition & 1 deletion rqt_joint_trajectory_controller/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(rqt_joint_trajectory_controller)

find_package(catkin REQUIRED COMPONENTS)
Expand Down
2 changes: 1 addition & 1 deletion velocity_controllers/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(velocity_controllers)

# Default to C++14
Expand Down

0 comments on commit d454fa4

Please sign in to comment.