From 7d88f5c22ec638e71073069ae0892a541f8fdd5e Mon Sep 17 00:00:00 2001 From: Kris Thielemans Date: Fri, 15 Sep 2023 22:26:35 +0100 Subject: [PATCH] [CMake] require v3.12 on Windows This is to avoid having to write some more work-arounds --- CMakeLists.txt | 10 +++++----- documentation/release_5.2.htm | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6417ebc5c3..cec25b64b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,11 +5,11 @@ # See STIR/LICENSE.txt for details # cmake file for building STIR. See the STIR User's Guide and http://www.cmake.org. -cmake_minimum_required(VERSION 3.1.0) - - -# avoid warning about WIN32 no longer defined in CYGWIN -set(CMAKE_LEGACY_CYGWIN_WIN32 0) +if (CMAKE_HOST_WIN32) + cmake_minimum_required(VERSION 3.12.0) +else() + cmake_minimum_required(VERSION 3.1.0) +endif() # enable ccache https://ccache.samba.org/ find_program(CCACHE_PROGRAM ccache) diff --git a/documentation/release_5.2.htm b/documentation/release_5.2.htm index 7d0b468a5d..6d40c3c9be 100644 --- a/documentation/release_5.2.htm +++ b/documentation/release_5.2.htm @@ -105,6 +105,7 @@

Deprecated functionality

Build system and dependencies