Skip to content

Commit

Permalink
Merge pull request #3076 from robotology/cmake3_19
Browse files Browse the repository at this point in the history
cmake_minimum_required is now 3.19
  • Loading branch information
randaz81 authored Jan 31, 2024
2 parents ac33ace + ba2f479 commit c09c9f6
Show file tree
Hide file tree
Showing 97 changed files with 110 additions and 119 deletions.
34 changes: 12 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,16 +170,6 @@ jobs:
fail-fast: false
matrix:
config:
- {
cmake_version: "3.17.*",
cmake_generator: "Unix Makefiles",
ycm_version: "0.15.3",
}
- {
cmake_version: "3.18.*",
cmake_generator: "Unix Makefiles",
ycm_version: "0.15.3",
}
- {
cmake_version: "3.19.*",
cmake_generator: "Unix Makefiles",
Expand Down Expand Up @@ -848,7 +838,7 @@ jobs:
id: prepare_environment_script
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
set(_env_script ${CMAKE_CURRENT_LIST_DIR}/environment_script.cmake)
file(WRITE "${_env_script}" "")
Expand Down Expand Up @@ -963,14 +953,14 @@ jobs:
- name: Print Environment Script
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
file(READ "${{ steps.prepare_environment_script.outputs.environment_script }}" _out)
message("${_out}")
- name: Print system information
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
include(${{ steps.prepare_environment_script.outputs.environment_script }})
set(_which_cmd which)
Expand Down Expand Up @@ -1048,7 +1038,7 @@ jobs:
- name: Configure
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
include(${{ steps.prepare_environment_script.outputs.environment_script }})
set(_generator)
Expand Down Expand Up @@ -1118,7 +1108,7 @@ jobs:
- name: Build
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
include(${{ steps.prepare_environment_script.outputs.environment_script }})
execute_process_x(
Expand All @@ -1140,7 +1130,7 @@ jobs:
- name: Run tests
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
include(${{ steps.prepare_environment_script.outputs.environment_script }})
execute_process_x(
Expand All @@ -1160,7 +1150,7 @@ jobs:
- name: Status Check
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
include(${{ steps.prepare_environment_script.outputs.environment_script }})
execute_process_x(
Expand Down Expand Up @@ -1188,7 +1178,7 @@ jobs:
- name: Test installation
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
include(${{ steps.prepare_environment_script.outputs.environment_script }})
execute_process_x(
Expand All @@ -1206,7 +1196,7 @@ jobs:
if: matrix.config.test_external_bindings
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
include(${{ steps.prepare_environment_script.outputs.environment_script }})
### FIXME Can we avoid this duplication?
Expand Down Expand Up @@ -1282,7 +1272,7 @@ jobs:
if: matrix.config.test_external_bindings
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
include(${{ steps.prepare_environment_script.outputs.environment_script }})
### FIXME Can we avoid this duplication?
Expand Down Expand Up @@ -1357,7 +1347,7 @@ jobs:
- name: Compress installation files
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
include(${{ steps.prepare_environment_script.outputs.environment_script }})
execute_process_x(
Expand All @@ -1375,7 +1365,7 @@ jobs:
- name: Cleanup
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
include(${{ steps.prepare_environment_script.outputs.environment_script }})
# Reset ccache stats before uploading
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-FileCopyrightText: 2006-2010 RobotCub Consortium
# SPDX-License-Identifier: BSD-3-Clause

cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)

# UseSWIG generates now standard target names.
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.13)
Expand Down
2 changes: 1 addition & 1 deletion bindings/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# SPDX-License-Identifier: BSD-3-Clause

if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)

# UseSWIG generates now standard target names.
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.13)
Expand Down
6 changes: 3 additions & 3 deletions cmake/YarpFindDependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -478,14 +478,14 @@ endmacro()
option(SKIP_ACE "Compile YARP without ACE (Linux only, limited functionality)" OFF)
mark_as_advanced(SKIP_ACE)
if(SKIP_ACE)
set_property(CACHE YARP_USE_ACE PROPERTY VALUE FALSE)
set(YARP_USE_ACE FALSE CACHE BOOL "Use ACE" FORCE)
unset(YARP_HAS_ACE) # Not set = disabled
elseif(YARP_HAS_SYSTEM_ACE)
set_property(CACHE YARP_USE_ACE PROPERTY VALUE TRUE)
set(YARP_USE_ACE TRUE CACHE BOOL "Use ACE" FORCE)
set(YARP_HAS_ACE TRUE)
set(YARP_USE_SYSTEM_ACE TRUE)
else()
set_property(CACHE YARP_USE_ACE PROPERTY VALUE FALSE)
set(YARP_USE_ACE FALSE CACHE BOOL "Use ACE" FORCE)
set(YARP_HAS_ACE FALSE)
endif()
set_property(CACHE YARP_USE_ACE PROPERTY TYPE INTERNAL)
Expand Down
1 change: 1 addition & 0 deletions doc/release/master.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Major Behaviour Changes
---------------------------------

* ROS1 support removed from github repo https://github.com/robotology/yarp and moved to legacy repo https://github.com/robotology/yarp-ros
* Removed support for CMake 3.16/3.17. CMake minimum version is now 3.19

Deprecations and removals
---------------------------------
Expand Down
2 changes: 1 addition & 1 deletion example/ContainerExample/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT)
# SPDX-License-Identifier: BSD-3-Clause

cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)

project(ContainerExample)

Expand Down
2 changes: 1 addition & 1 deletion example/RFModulePlugin/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT)
# SPDX-License-Identifier: BSD-3-Clause

cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)
project(myModules)

# Enable C++14
Expand Down
2 changes: 1 addition & 1 deletion example/carrier/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-FileCopyrightText: 2006-2010 RobotCub Consortium
# SPDX-License-Identifier: BSD-3-Clause

cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)
project(Carrier)

find_package(YARP COMPONENTS os REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion example/cmake/hello/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# SPDX-License-Identifier: BSD-3-Clause

# YARP needs CMake 3.0 or greater
cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)

# find YARP
find_package(YARP COMPONENTS os REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion example/cmake/versioned_yarp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Test finding specific installed version of YARP

cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)

#find_package(YARP 2 REQUIRED) # should fail
#find_package(YARP 3.3.3 REQUIRED) # should succeed for YARP 3.3.3
Expand Down
2 changes: 1 addition & 1 deletion example/cmake/with_opencv/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-FileCopyrightText: 2006-2010 RobotCub Consortium
# SPDX-License-Identifier: BSD-3-Clause

cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)

# create the program "foo"
add_executable(foo)
Expand Down
2 changes: 1 addition & 1 deletion example/dev/RGBD/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: BSD-3-Clause

if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)
project(RGBD)
find_package(YARP REQUIRED COMPONENTS os sig dev)
endif()
Expand Down
2 changes: 1 addition & 1 deletion example/dev/attachable/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# SPDX-License-Identifier: BSD-3-Clause

if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)
project(attachable)
find_package(YARP REQUIRED COMPONENTS os sig dev)
endif()
Expand Down
2 changes: 1 addition & 1 deletion example/dev/audio_test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: BSD-3-Clause

if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)
project(audio_test)
find_package(YARP REQUIRED COMPONENTS os sig dev)
endif()
Expand Down
2 changes: 1 addition & 1 deletion example/dev/fake_motor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: BSD-3-Clause

if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)
project(fake_motor)
find_package(YARP REQUIRED COMPONENTS os dev)
endif()
Expand Down
2 changes: 1 addition & 1 deletion example/dev/grabber_client/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: BSD-3-Clause

if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)
project(grabber_client)
find_package(YARP REQUIRED COMPONENTS os sig dev)
endif()
Expand Down
2 changes: 1 addition & 1 deletion example/dev/grabber_crop/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: BSD-3-Clause

if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)
project(grabber_crop)
find_package(YARP REQUIRED COMPONENTS os sig dev)
endif()
Expand Down
2 changes: 1 addition & 1 deletion example/dev/motorcontrol/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: BSD-3-Clause

if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)
project(motorcontrol)
find_package(YARP REQUIRED COMPONENTS os dev)
endif()
Expand Down
2 changes: 1 addition & 1 deletion example/dev/motortest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: BSD-3-Clause

if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)
project(motortest)
find_package(YARP REQUIRED COMPONENTS os dev)
endif()
Expand Down
2 changes: 1 addition & 1 deletion example/dev/simple_motor_client/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: BSD-3-Clause

if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)
project(simple_motor_client)
find_package(YARP REQUIRED COMPONENTS os dev)
endif()
Expand Down
2 changes: 1 addition & 1 deletion example/dev_check/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-FileCopyrightText: 2006-2010 RobotCub Consortium
# SPDX-License-Identifier: BSD-3-Clause

cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)
project(dev_check)

find_package(YARP COMPONENTS os sig dev REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion example/dll/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT)
# SPDX-License-Identifier: BSD-3-Clause

cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)

find_package(YARP COMPONENTS os REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion example/external/c/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-FileCopyrightText: 2006-2010 RobotCub Consortium
# SPDX-License-Identifier: BSD-3-Clause

cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)

PROJECT(yarp_without_yarp_in_c)

Expand Down
2 changes: 1 addition & 1 deletion example/external/nameserver_proxy/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Make sure that YARP_DIR is set in your environment to wherever you
# compiled YARP.

cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)

find_package(YARP COMPONENTS os name REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion example/externaldevices/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-FileCopyrightText: 2006-2010 RobotCub Consortium
# SPDX-License-Identifier: BSD-3-Clause

cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)

find_package(YARP COMPONENTS os dev REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion example/externaldevices/baz/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-FileCopyrightText: 2006-2010 RobotCub Consortium
# SPDX-License-Identifier: BSD-3-Clause

cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)

find_package(YARP REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion example/externaldevices/baz/bazBot/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-FileCopyrightText: 2006-2010 RobotCub Consortium
# SPDX-License-Identifier: BSD-3-Clause

cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)

find_package(YARP COMPONENTS os dev REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion example/externaldevices/baz/bazDevice/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-FileCopyrightText: 2006-2010 RobotCub Consortium
# SPDX-License-Identifier: BSD-3-Clause

cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)

find_package(YARP COMPONENTS os dev REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion example/externaldevices/foo/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-FileCopyrightText: 2006-2010 RobotCub Consortium
# SPDX-License-Identifier: BSD-3-Clause

cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)

find_package(YARP COMPONENTS os dev REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion example/externaldevices/foo/fooBot/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-FileCopyrightText: 2006-2010 RobotCub Consortium
# SPDX-License-Identifier: BSD-3-Clause

cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.19)

find_package(YARP COMPONENTS os dev REQUIRED)

Expand Down
Loading

0 comments on commit c09c9f6

Please sign in to comment.