From 0db63bebb11953cedb7d43467f9105c91b457c84 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Mon, 31 Mar 2025 10:05:56 +0200 Subject: [PATCH 1/2] Bump the minimum version of CMake to 3.5, to be able to compile with CMake 4.0 --- CMakeLists.txt | 2 +- source/CMakeLists.txt | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 891b924..0a3bb9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ ###################################################### # cmake file for building LCCD # @author Jan Engels, DESY -CMAKE_MINIMUM_REQUIRED( VERSION 2.6 FATAL_ERROR ) +CMAKE_MINIMUM_REQUIRED( VERSION 3.5 FATAL_ERROR ) ###################################################### diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 5a708e3..ef67935 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -8,11 +8,6 @@ INCLUDE_DIRECTORIES( BEFORE "${PROJECT_SOURCE_DIR}/source/include" ) INCLUDE_DIRECTORIES( ${PROJECT_BINARY_DIR} ) -# omit warning about preprocessor definitions being escaped -IF(COMMAND CMAKE_POLICY) - CMAKE_POLICY(SET CMP0005 OLD) -ENDIF() - # specific LCCD variable IF( NOT LCCD_DB_INIT ) SET( LCCD_DB_INIT "localhost:lccd_test:calvin:hobbes" ) @@ -24,7 +19,7 @@ SET( LCCD_DB_INIT "${LCCD_DB_INIT}" CACHE STRING "DB initialization" FORCE ) #----- need long long for int64 for now ------ #FIXME: should establish wether we are on a 32bit or 64 bit machine .... #ADD_DEFINITIONS( "-Wno-long-long" ) -ADD_DEFINITIONS( "-DLCCD_DB_INIT_DEFAULT=\\\"${LCCD_DB_INIT}\\\"" ) +ADD_DEFINITIONS( "-DLCCD_DB_INIT_DEFAULT=\"${LCCD_DB_INIT}\"" ) FILE( GLOB lccd_headers RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "./include/lccd/*.h?" ) From 935d07b9da61cffd0798d416634c19f640ce2a95 Mon Sep 17 00:00:00 2001 From: Juan Miguel Carceller Date: Tue, 19 May 2026 13:44:53 +0200 Subject: [PATCH 2/2] Bump the minimum required version to 3.10 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a3bb9a..443fb3a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ ###################################################### # cmake file for building LCCD # @author Jan Engels, DESY -CMAKE_MINIMUM_REQUIRED( VERSION 3.5 FATAL_ERROR ) +CMAKE_MINIMUM_REQUIRED( VERSION 3.10 FATAL_ERROR ) ######################################################