mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-22 05:16:10 +01:00
Raise the minimum CMake version to 3.10 (#2523)
This commit is contained in:
parent
4b3defe4af
commit
98d37da03e
@ -1,4 +1,4 @@
|
|||||||
cmake_minimum_required(VERSION 3.5)
|
cmake_minimum_required(VERSION 3.10)
|
||||||
|
|
||||||
# detect if Catch is being bundled,
|
# detect if Catch is being bundled,
|
||||||
# disable testsuite in that case
|
# disable testsuite in that case
|
||||||
@ -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")
|
message(FATAL_ERROR "Building in-source is not supported! Create a build dir and remove ${CMAKE_SOURCE_DIR}/CMakeCache.txt")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.9)
|
project(Catch2
|
||||||
# Enable IPO for CMake versions that support it
|
VERSION 3.1.0 # CML version placeholder, don't delete
|
||||||
cmake_policy(SET CMP0069 NEW)
|
LANGUAGES CXX
|
||||||
project(Catch2
|
# HOMEPAGE_URL is not supported until CMake version 3.12, which
|
||||||
VERSION 3.1.0 # CML version placeholder, don't delete
|
# we do not target yet.
|
||||||
LANGUAGES CXX
|
# HOMEPAGE_URL "https://github.com/catchorg/Catch2"
|
||||||
# HOMEPAGE_URL is not supported until CMake version 3.12, which
|
DESCRIPTION "A modern, C++-native, unit test framework."
|
||||||
# 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()
|
|
||||||
|
|
||||||
# Provide path for scripts. We first add path to the scripts we don't use,
|
# 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.
|
# but projects including us might, and set the path up to parent scope.
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
cmake_minimum_required( VERSION 3.5 )
|
cmake_minimum_required( VERSION 3.10 )
|
||||||
|
|
||||||
project( Catch2Examples LANGUAGES CXX )
|
project( Catch2Examples LANGUAGES CXX )
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Build extra tests.
|
# Build extra tests.
|
||||||
#
|
#
|
||||||
|
|
||||||
cmake_minimum_required( VERSION 3.5 )
|
cmake_minimum_required( VERSION 3.10 )
|
||||||
|
|
||||||
project( Catch2ExtraTests LANGUAGES CXX )
|
project( Catch2ExtraTests LANGUAGES CXX )
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user