mirror of
https://github.com/slsdetectorgroup/aare.git
synced 2025-06-29 22:50:47 +02:00
patch to allow cmake 4.0.0 bumped version
This commit is contained in:
@ -81,12 +81,12 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
|||||||
|
|
||||||
if(AARE_FETCH_LMFIT)
|
if(AARE_FETCH_LMFIT)
|
||||||
#TODO! Should we fetch lmfit from the web or inlcude a tar.gz in the repo?
|
#TODO! Should we fetch lmfit from the web or inlcude a tar.gz in the repo?
|
||||||
set(lmfit_patch git apply ${CMAKE_CURRENT_SOURCE_DIR}/patches/lmfit.patch)
|
set(LMFIT_PATCH_COMMAND git apply ${CMAKE_CURRENT_SOURCE_DIR}/patches/lmfit.patch)
|
||||||
FetchContent_Declare(
|
FetchContent_Declare(
|
||||||
lmfit
|
lmfit
|
||||||
GIT_REPOSITORY https://jugit.fz-juelich.de/mlz/lmfit.git
|
GIT_REPOSITORY https://jugit.fz-juelich.de/mlz/lmfit.git
|
||||||
GIT_TAG main
|
GIT_TAG main
|
||||||
PATCH_COMMAND ${lmfit_patch}
|
PATCH_COMMAND ${LMFIT_PATCH_COMMAND}
|
||||||
UPDATE_DISCONNECTED 1
|
UPDATE_DISCONNECTED 1
|
||||||
EXCLUDE_FROM_ALL 1
|
EXCLUDE_FROM_ALL 1
|
||||||
)
|
)
|
||||||
@ -111,10 +111,12 @@ if(AARE_FETCH_ZMQ)
|
|||||||
if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.30")
|
if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.30")
|
||||||
cmake_policy(SET CMP0169 OLD)
|
cmake_policy(SET CMP0169 OLD)
|
||||||
endif()
|
endif()
|
||||||
|
set(ZMQ_PATCH_COMMAND git apply ${CMAKE_CURRENT_SOURCE_DIR}/patches/libzmq_cmake_version.patch)
|
||||||
FetchContent_Declare(
|
FetchContent_Declare(
|
||||||
libzmq
|
libzmq
|
||||||
GIT_REPOSITORY https://github.com/zeromq/libzmq.git
|
GIT_REPOSITORY https://github.com/zeromq/libzmq.git
|
||||||
GIT_TAG v4.3.4
|
GIT_TAG v4.3.4
|
||||||
|
PATCH_COMMAND ${ZMQ_PATCH_COMMAND}
|
||||||
)
|
)
|
||||||
# Disable unwanted options from libzmq
|
# Disable unwanted options from libzmq
|
||||||
set(BUILD_TESTS OFF CACHE BOOL "Switch off libzmq test build")
|
set(BUILD_TESTS OFF CACHE BOOL "Switch off libzmq test build")
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package:
|
package:
|
||||||
name: aare
|
name: aare
|
||||||
version: 2025.3.18 #TODO! how to not duplicate this?
|
version: 2025.4.1 #TODO! how to not duplicate this?
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
18
patches/libzmq_cmake_version.patch
Normal file
18
patches/libzmq_cmake_version.patch
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index dd3d8eb9..c0187747 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -1,11 +1,8 @@
|
||||||
|
# CMake build script for ZeroMQ
|
||||||
|
project(ZeroMQ)
|
||||||
|
|
||||||
|
-if(${CMAKE_SYSTEM_NAME} STREQUAL Darwin)
|
||||||
|
- cmake_minimum_required(VERSION 3.0.2)
|
||||||
|
-else()
|
||||||
|
- cmake_minimum_required(VERSION 2.8.12)
|
||||||
|
-endif()
|
||||||
|
+cmake_minimum_required(VERSION 3.15)
|
||||||
|
+message(STATUS "Patched cmake version")
|
||||||
|
|
||||||
|
include(CheckIncludeFiles)
|
||||||
|
include(CheckCCompilerFlag)
|
@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
|
|||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "aare"
|
name = "aare"
|
||||||
version = "2025.3.18"
|
version = "2025.4.1"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user