From 73389fe1855b20b49f7009577cc2c79ec1a2da2e Mon Sep 17 00:00:00 2001 From: Luis Antonio Obis Aparicio Date: Tue, 31 May 2022 13:42:15 +0200 Subject: [PATCH 1/2] Fixes https://github.com/rest-for-physics/framework/issues/236 --- CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1bf745da4..325017a72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,10 +19,8 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin") SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-stdlib=libc++") endif (CMAKE_SYSTEM_NAME MATCHES "Darwin") -# https://github.com/rest-for-physics/framework/issues/162 -if (${CMAKE_VERSION} VERSION_LESS "3.21") - cmake_policy(SET CMP0082 OLD) -endif () +# https://github.com/rest-for-physics/framework/issues/162 & https://github.com/rest-for-physics/framework/issues/236 +cmake_policy(SET CMP0082 OLD) # Install path if (NOT DEFINED INSTALL_PREFIX) From 50d0a7cb6c8099de6de6b3d4d92dadb687f43ecc Mon Sep 17 00:00:00 2001 From: Luis Obis <35803280+lobis@users.noreply.github.com> Date: Tue, 7 Jun 2022 09:55:48 +0200 Subject: [PATCH 2/2] CMakeLists - Applied `cmake_policy(SET CMP0082 OLD)` for versions older then 3.23 instead of always --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 325017a72..239f72c40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,9 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin") endif (CMAKE_SYSTEM_NAME MATCHES "Darwin") # https://github.com/rest-for-physics/framework/issues/162 & https://github.com/rest-for-physics/framework/issues/236 -cmake_policy(SET CMP0082 OLD) +if (${CMAKE_VERSION} VERSION_LESS "3.23") + cmake_policy(SET CMP0082 OLD) +endif () # Install path if (NOT DEFINED INSTALL_PREFIX)