From 5b07ec643c4ed007df47f9775eec00e2d9410128 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Wed, 7 Aug 2024 09:43:47 +0200 Subject: [PATCH 1/5] require consistent minimal cmake version --- CMakeLists.txt | 6 +----- lapack-netlib/INSTALL/CMakeLists.txt | 2 +- lapack-netlib/LAPACKE/mangling/CMakeLists.txt | 2 +- lapack-netlib/lapack_build.cmake | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 314e8d9d8..0e287eb9b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ ## Author: Hank Anderson ## -cmake_minimum_required(VERSION 2.8.5) +cmake_minimum_required(VERSION 3.6) project(OpenBLAS C ASM) @@ -258,10 +258,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "AIX|Android|Linux|FreeBSD|OpenBSD|NetBSD|Drago endif() endif() -if (APPLE AND BUILD_SHARED_LIBS) -set(CMAKE_MACOSX_RPATH ON) -endif() - # Seems that this hack doesn't required since macOS 11 Big Sur if (APPLE AND BUILD_SHARED_LIBS AND CMAKE_HOST_SYSTEM_VERSION VERSION_LESS 20) set (CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1) diff --git a/lapack-netlib/INSTALL/CMakeLists.txt b/lapack-netlib/INSTALL/CMakeLists.txt index 1e808a64c..b6c26753d 100644 --- a/lapack-netlib/INSTALL/CMakeLists.txt +++ b/lapack-netlib/INSTALL/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.7) +cmake_minimum_required(VERSION 3.6) project(TIMING Fortran) add_executable(secondtst_NONE second_NONE.f secondtst.f) add_executable(secondtst_EXT_ETIME second_EXT_ETIME.f secondtst.f) diff --git a/lapack-netlib/LAPACKE/mangling/CMakeLists.txt b/lapack-netlib/LAPACKE/mangling/CMakeLists.txt index 88ac0d85d..1b6b308e0 100644 --- a/lapack-netlib/LAPACKE/mangling/CMakeLists.txt +++ b/lapack-netlib/LAPACKE/mangling/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.7) +cmake_minimum_required(VERSION 3.6) project(MANGLING C Fortran) add_executable(xintface Fintface.f Cintface.c) diff --git a/lapack-netlib/lapack_build.cmake b/lapack-netlib/lapack_build.cmake index 39878cb24..b15e18e44 100644 --- a/lapack-netlib/lapack_build.cmake +++ b/lapack-netlib/lapack_build.cmake @@ -4,7 +4,7 @@ ## HINTS: ctest -Ddashboard_model=Nightly -S $(pwd)/lapack/lapack_build.cmake ## -cmake_minimum_required(VERSION 2.8.10) +cmake_minimum_required(VERSION 3.6) ################################################################### # The values in this section must always be provided ################################################################### From 1ef9f24b39ece20e2fa3b3a2aab591da2037c346 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Wed, 7 Aug 2024 16:37:02 +0200 Subject: [PATCH 2/5] Revert "require consistent minimal cmake version" This reverts commit 5b07ec643c4ed007df47f9775eec00e2d9410128. --- CMakeLists.txt | 6 +++++- lapack-netlib/INSTALL/CMakeLists.txt | 2 +- lapack-netlib/LAPACKE/mangling/CMakeLists.txt | 2 +- lapack-netlib/lapack_build.cmake | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e287eb9b..314e8d9d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ ## Author: Hank Anderson ## -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 2.8.5) project(OpenBLAS C ASM) @@ -258,6 +258,10 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "AIX|Android|Linux|FreeBSD|OpenBSD|NetBSD|Drago endif() endif() +if (APPLE AND BUILD_SHARED_LIBS) +set(CMAKE_MACOSX_RPATH ON) +endif() + # Seems that this hack doesn't required since macOS 11 Big Sur if (APPLE AND BUILD_SHARED_LIBS AND CMAKE_HOST_SYSTEM_VERSION VERSION_LESS 20) set (CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1) diff --git a/lapack-netlib/INSTALL/CMakeLists.txt b/lapack-netlib/INSTALL/CMakeLists.txt index b6c26753d..1e808a64c 100644 --- a/lapack-netlib/INSTALL/CMakeLists.txt +++ b/lapack-netlib/INSTALL/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 2.8.7) project(TIMING Fortran) add_executable(secondtst_NONE second_NONE.f secondtst.f) add_executable(secondtst_EXT_ETIME second_EXT_ETIME.f secondtst.f) diff --git a/lapack-netlib/LAPACKE/mangling/CMakeLists.txt b/lapack-netlib/LAPACKE/mangling/CMakeLists.txt index 1b6b308e0..88ac0d85d 100644 --- a/lapack-netlib/LAPACKE/mangling/CMakeLists.txt +++ b/lapack-netlib/LAPACKE/mangling/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 2.8.7) project(MANGLING C Fortran) add_executable(xintface Fintface.f Cintface.c) diff --git a/lapack-netlib/lapack_build.cmake b/lapack-netlib/lapack_build.cmake index b15e18e44..39878cb24 100644 --- a/lapack-netlib/lapack_build.cmake +++ b/lapack-netlib/lapack_build.cmake @@ -4,7 +4,7 @@ ## HINTS: ctest -Ddashboard_model=Nightly -S $(pwd)/lapack/lapack_build.cmake ## -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 2.8.10) ################################################################### # The values in this section must always be provided ################################################################### From f49371c1ba2ce00169892b194fc4e50dd9bfb6c2 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Wed, 7 Aug 2024 16:40:11 +0200 Subject: [PATCH 3/5] Set CMake 3.0 policies to NEW --- CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 314e8d9d8..c6a80b13a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ ## Author: Hank Anderson ## -cmake_minimum_required(VERSION 2.8.5) +cmake_minimum_required(VERSION 2.8.5...3.0) project(OpenBLAS C ASM) @@ -258,10 +258,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "AIX|Android|Linux|FreeBSD|OpenBSD|NetBSD|Drago endif() endif() -if (APPLE AND BUILD_SHARED_LIBS) -set(CMAKE_MACOSX_RPATH ON) -endif() - # Seems that this hack doesn't required since macOS 11 Big Sur if (APPLE AND BUILD_SHARED_LIBS AND CMAKE_HOST_SYSTEM_VERSION VERSION_LESS 20) set (CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1) From fe0a69e3084df97849055346ca29eaee78d1c166 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Wed, 7 Aug 2024 16:43:45 +0200 Subject: [PATCH 4/5] even less invasive --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c6a80b13a..a4e025503 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,9 @@ ## Author: Hank Anderson ## -cmake_minimum_required(VERSION 2.8.5...3.0) +cmake_minimum_required(VERSION 2.8.5) + +cmake_policy(SET CMP0042 NEW) project(OpenBLAS C ASM) From 0e6a2cc93cfb68b793e662b03384777ce445c963 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Fri, 25 Oct 2024 16:47:52 +0200 Subject: [PATCH 5/5] bump the minimum_required version instead --- CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4e025503..4d193f4d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,9 +2,7 @@ ## Author: Hank Anderson ## -cmake_minimum_required(VERSION 2.8.5) - -cmake_policy(SET CMP0042 NEW) +cmake_minimum_required(VERSION 3.16.0) project(OpenBLAS C ASM)