From b5912665dabd8361760022bcb8fa2b077f1a107e Mon Sep 17 00:00:00 2001 From: Ryan Friedman Date: Mon, 4 Dec 2023 20:58:16 -0700 Subject: [PATCH 1/2] Fix unknown CMP0148 with a cmake minimum range Signed-off-by: Ryan Friedman --- mav_msgs/CMakeLists.txt | 4 +--- mav_planning_msgs/CMakeLists.txt | 4 +--- mav_state_machine_msgs/CMakeLists.txt | 4 +--- mav_system_msgs/CMakeLists.txt | 3 +-- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/mav_msgs/CMakeLists.txt b/mav_msgs/CMakeLists.txt index 8ef06e0..e3e8c28 100644 --- a/mav_msgs/CMakeLists.txt +++ b/mav_msgs/CMakeLists.txt @@ -1,8 +1,6 @@ -cmake_minimum_required(VERSION 3.14.4) +cmake_minimum_required(VERSION 3.14.4..3.27) project(mav_msgs) -cmake_policy(SET CMP0148 OLD) - find_package(ament_cmake REQUIRED) find_package(Eigen3 REQUIRED) diff --git a/mav_planning_msgs/CMakeLists.txt b/mav_planning_msgs/CMakeLists.txt index 4175550..88301f8 100644 --- a/mav_planning_msgs/CMakeLists.txt +++ b/mav_planning_msgs/CMakeLists.txt @@ -1,8 +1,6 @@ -cmake_minimum_required(VERSION 3.14.4) +cmake_minimum_required(VERSION 3.14.4..3.27) project(mav_planning_msgs) -cmake_policy(SET CMP0148 OLD) - find_package(ament_cmake REQUIRED) find_package(Eigen3 REQUIRED) diff --git a/mav_state_machine_msgs/CMakeLists.txt b/mav_state_machine_msgs/CMakeLists.txt index 407509f..f95d837 100644 --- a/mav_state_machine_msgs/CMakeLists.txt +++ b/mav_state_machine_msgs/CMakeLists.txt @@ -1,8 +1,6 @@ -cmake_minimum_required(VERSION 3.14.4) +cmake_minimum_required(VERSION 3.14.4..3.27) project(mav_state_machine_msgs) -cmake_policy(SET CMP0148 OLD) - find_package(ament_cmake REQUIRED) find_package(std_msgs REQUIRED) diff --git a/mav_system_msgs/CMakeLists.txt b/mav_system_msgs/CMakeLists.txt index dc4a916..aeb2fef 100644 --- a/mav_system_msgs/CMakeLists.txt +++ b/mav_system_msgs/CMakeLists.txt @@ -1,7 +1,6 @@ -cmake_minimum_required(VERSION 3.14.4) +cmake_minimum_required(VERSION 3.14.4..3.27) project(mav_system_msgs) -cmake_policy(SET CMP0148 OLD) find_package(std_msgs REQUIRED) From 800c6097162b3f5fd5f6e84fbe8ec95cd0fea1f9 Mon Sep 17 00:00:00 2001 From: Ryan Friedman Date: Tue, 5 Dec 2023 14:11:49 -0700 Subject: [PATCH 2/2] Adapt for MacOS on 3.28 * Use 3 dots for version range Signed-off-by: Ryan Friedman --- mav_msgs/CMakeLists.txt | 6 +++++- mav_planning_msgs/CMakeLists.txt | 6 +++++- mav_state_machine_msgs/CMakeLists.txt | 6 +++++- mav_system_msgs/CMakeLists.txt | 5 ++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/mav_msgs/CMakeLists.txt b/mav_msgs/CMakeLists.txt index e3e8c28..149dbbb 100644 --- a/mav_msgs/CMakeLists.txt +++ b/mav_msgs/CMakeLists.txt @@ -1,6 +1,10 @@ -cmake_minimum_required(VERSION 3.14.4..3.27) +cmake_minimum_required(VERSION 3.14.4...3.27) project(mav_msgs) +if(${CMAKE_VERSION} VERSION_GREATER 3.27) + cmake_policy(SET CMP0148 OLD) +endif() + find_package(ament_cmake REQUIRED) find_package(Eigen3 REQUIRED) diff --git a/mav_planning_msgs/CMakeLists.txt b/mav_planning_msgs/CMakeLists.txt index 88301f8..0a23a65 100644 --- a/mav_planning_msgs/CMakeLists.txt +++ b/mav_planning_msgs/CMakeLists.txt @@ -1,6 +1,10 @@ -cmake_minimum_required(VERSION 3.14.4..3.27) +cmake_minimum_required(VERSION 3.14.4...3.27) project(mav_planning_msgs) +if(${CMAKE_VERSION} VERSION_GREATER 3.27) + cmake_policy(SET CMP0148 OLD) +endif() + find_package(ament_cmake REQUIRED) find_package(Eigen3 REQUIRED) diff --git a/mav_state_machine_msgs/CMakeLists.txt b/mav_state_machine_msgs/CMakeLists.txt index f95d837..53c520f 100644 --- a/mav_state_machine_msgs/CMakeLists.txt +++ b/mav_state_machine_msgs/CMakeLists.txt @@ -1,6 +1,10 @@ -cmake_minimum_required(VERSION 3.14.4..3.27) +cmake_minimum_required(VERSION 3.14.4...3.27) project(mav_state_machine_msgs) +if(${CMAKE_VERSION} VERSION_GREATER 3.27) + cmake_policy(SET CMP0148 OLD) +endif() + find_package(ament_cmake REQUIRED) find_package(std_msgs REQUIRED) diff --git a/mav_system_msgs/CMakeLists.txt b/mav_system_msgs/CMakeLists.txt index aeb2fef..5c5b4b5 100644 --- a/mav_system_msgs/CMakeLists.txt +++ b/mav_system_msgs/CMakeLists.txt @@ -1,6 +1,9 @@ -cmake_minimum_required(VERSION 3.14.4..3.27) +cmake_minimum_required(VERSION 3.14.4...3.27) project(mav_system_msgs) +if(${CMAKE_VERSION} VERSION_GREATER 3.27) + cmake_policy(SET CMP0148 OLD) +endif() find_package(std_msgs REQUIRED)