Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump CMake minimum version in other places #1053

Merged
merged 1 commit into from
Jan 22, 2020
Merged

bump CMake minimum version in other places #1053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/toplevel.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# toplevel CMakeLists.txt for a catkin workspace
# catkin/cmake/toplevel.cmake

cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)

set(CATKIN_TOPLEVEL TRUE)

Expand Down
2 changes: 1 addition & 1 deletion doc/adv_user_guide/catkin_migration.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ The contents of the /stick/stick/package.xml must look like this::

The contents of the /stick/stick/CMakeLists.txt looks like this::

cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(stick)
find_package(catkin REQUIRED)
catkin_metapackage()
Expand Down
2 changes: 1 addition & 1 deletion doc/howto/format1/catkin_overview.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ CMakeLists.txt
Catkin ``CMakeLists.txt`` files mostly contain ordinary CMake
commands, plus a few catkin-specific ones. They begin like this::

cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(your_package)

Substitute the actual name of your package in the ``project()``
Expand Down
2 changes: 1 addition & 1 deletion doc/howto/format2/catkin_overview.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ CMakeLists.txt
Catkin ``CMakeLists.txt`` files mostly contain ordinary CMake
commands, plus a few catkin-specific ones. They begin like this::

cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(your_package)

Substitute the actual name of your package in the ``project()``
Expand Down
2 changes: 1 addition & 1 deletion doc/user_guide/standards.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ For inspiration, look at the guideline examples here:

The following lines must always appear the CMakeLists.txt in this order::

cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(myproject)
find_package(catkin REQUIRED <COMPONENTS ...>)
catkin_package(<...>)
Expand Down
2 changes: 1 addition & 1 deletion test/mock_resources/src-fail/badly_specified_changelog/CMakeLists.txt
View file
Open in desktop
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(badly_specified_changelog)
find_package(catkin)
Expand Down
2 changes: 1 addition & 1 deletion test/mock_resources/src-fail/noproject/CMakeLists.txt
View file
Open in desktop
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)
# commented to cause failure
# project(noproject)
find_package(catkin)
Expand Down