mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-14 00:10:45 +03:00
8303dd027d
Fix for CMake 4 Closes: https://bugs.gentoo.org/951671 Signed-off-by: NHOrus <jy6x2b32pie9@yahoo.com> Closes: https://github.com/gentoo/gentoo/pull/41207 Signed-off-by: Sam James <sam@gentoo.org>
34 lines
903 B
Diff
34 lines
903 B
Diff
Bump CMake minimum version, delete obsolete policy that's related to MacOS and
|
|
doesn't worry us
|
|
https://bugs.gentoo.org/951671
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1,4 +1,4 @@
|
|
-cmake_minimum_required(VERSION 3.0)
|
|
+cmake_minimum_required(VERSION 3.5)
|
|
|
|
# setup directory where we should look for cmake files
|
|
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
|
|
--- a/src/catch/CMakeLists.txt
|
|
+++ b/src/catch/CMakeLists.txt
|
|
@@ -1,4 +1,4 @@
|
|
-cmake_minimum_required(VERSION 2.8)
|
|
+cmake_minimum_required(VERSION 3.5)
|
|
project(catch_builder CXX)
|
|
include(ExternalProject)
|
|
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -16,11 +16,6 @@
|
|
cmake_policy(SET CMP0007 NEW)
|
|
cmake_policy(SET CMP0012 NEW)
|
|
|
|
-if (${CMAKE_MAJOR_VERSION} GREATER 2)
|
|
- # old policy do not use MACOSX_RPATH
|
|
- cmake_policy(SET CMP0042 OLD)
|
|
-endif()
|
|
-
|
|
set(MAJOR_VERSION 1)
|
|
set(MINOR_VERSION 4)
|
|
set(PATCH_VERSION 0)
|