Skip to content

Commit

Permalink
Raise the minimum CMake version to 3.10 (#2523)
Browse files Browse the repository at this point in the history
  • Loading branch information
dimztimz committed Sep 16, 2022
1 parent 4b3defe commit 98d37da
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 20 deletions.
28 changes: 10 additions & 18 deletions CMakeLists.txt
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

# detect if Catch is being bundled,
# disable testsuite in that case
Expand Down Expand Up @@ -30,23 +30,15 @@ if (CMAKE_BINARY_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
message(FATAL_ERROR "Building in-source is not supported! Create a build dir and remove ${CMAKE_SOURCE_DIR}/CMakeCache.txt")
endif()

if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.9)
# Enable IPO for CMake versions that support it
cmake_policy(SET CMP0069 NEW)
project(Catch2
VERSION 3.1.0 # CML version placeholder, don't delete
LANGUAGES CXX
# HOMEPAGE_URL is not supported until CMake version 3.12, which
# we do not target yet.
# HOMEPAGE_URL "https://github.com/catchorg/Catch2"
DESCRIPTION "A modern, C++-native, unit test framework."
)
else()
project(Catch2
VERSION 3.1.0 # CML version placeholder, don't delete
LANGUAGES CXX
)
endif()
project(Catch2
VERSION 3.1.0 # CML version placeholder, don't delete
LANGUAGES CXX
# HOMEPAGE_URL is not supported until CMake version 3.12, which
# we do not target yet.
# HOMEPAGE_URL "https://github.com/catchorg/Catch2"
DESCRIPTION "A modern, C++-native, unit test framework."
)


# Provide path for scripts. We first add path to the scripts we don't use,
# but projects including us might, and set the path up to parent scope.
Expand Down
2 changes: 1 addition & 1 deletion examples/CMakeLists.txt
@@ -1,4 +1,4 @@
cmake_minimum_required( VERSION 3.5 )
cmake_minimum_required( VERSION 3.10 )

project( Catch2Examples LANGUAGES CXX )

Expand Down
2 changes: 1 addition & 1 deletion tests/ExtraTests/CMakeLists.txt
Expand Up @@ -2,7 +2,7 @@
# Build extra tests.
#

cmake_minimum_required( VERSION 3.5 )
cmake_minimum_required( VERSION 3.10 )

project( Catch2ExtraTests LANGUAGES CXX )

Expand Down

0 comments on commit 98d37da

Please sign in to comment.