detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 03:40:04 +02:00
Code Issues Actions Packages Releases Activity

switched patch tool
Some checks failed
Native CMake Build / Configure and build using cmake (push) Failing after 9s
Details

Browse Source
This commit is contained in:
froejdh_e 2025-03-28 18:26:45 +01:00
parent 3312adddd1
commit 95e11d668a
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -41,19 +41,19 @@ endif()
# Patch libzmq to set minimum cmake version to 3.15 to avoid warnings # Patch libzmq to set minimum cmake version to 3.15 to avoid warnings
# with newer cmake versions # with newer cmake versions
set(ZMQ_PATCH_CMAKE git apply ${CMAKE_CURRENT_LIST_DIR}/libs/libzmq/libzmq_cmake_version.patch) # Patch is applied in the FetchContent_Declare
set(SLS_LIBZMQ_VERSION "4.3.4") set(SLS_LIBZMQ_VERSION "4.3.4")
if(SLS_FETCH_ZMQ_FROM_GITHUB) if(SLS_FETCH_ZMQ_FROM_GITHUB)
# Opt in to pull down a zmq version from github instead of # Opt in to pull down a zmq version from github instead of
# using the bundled verison # using the bundled version
FetchContent_Declare( FetchContent_Declare(
libzmq libzmq
GIT_REPOSITORY https://github.com/zeromq/libzmq.git GIT_REPOSITORY https://github.com/zeromq/libzmq.git
GIT_TAG v${SLS_LIBZMQ_VERSION} GIT_TAG v${SLS_LIBZMQ_VERSION}
PATCH_COMMAND ${ZMQ_PATCH_CMAKE} PATCH_COMMAND ${CMAKE_COMMAND} -E chdir <SOURCE_DIR> patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/libs/libzmq/libzmq_cmake_version.patch
UPDATE_DISCONNECTED 1
) )
else() else()
# Standard behaviour use libzmq included in this repo (libs/libzmq) # Standard behaviour use libzmq included in this repo (libs/libzmq)
@ -61,7 +61,8 @@ else()
libzmq libzmq
URL ${CMAKE_CURRENT_SOURCE_DIR}/libs/libzmq/libzmq-${SLS_LIBZMQ_VERSION}.tar.gz URL ${CMAKE_CURRENT_SOURCE_DIR}/libs/libzmq/libzmq-${SLS_LIBZMQ_VERSION}.tar.gz
URL_HASH MD5=cc20b769ac10afa352e5ed2769bb23b3 URL_HASH MD5=cc20b769ac10afa352e5ed2769bb23b3
PATCH_COMMAND ${ZMQ_PATCH_CMAKE} PATCH_COMMAND ${CMAKE_COMMAND} -E chdir <SOURCE_DIR> patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/libs/libzmq/libzmq_cmake_version.patch
UPDATE_DISCONNECTED 1
) )
endif() endif()

2
conda-recipes/main-library/meta.yaml
View File

@ -17,7 +17,7 @@ requirements:
- {{ compiler('c') }} - {{ compiler('c') }}
- {{ stdlib("c") }} - {{ stdlib("c") }}
- {{ compiler('cxx') }} - {{ compiler('cxx') }}
- git
- cmake - cmake
- ninja - ninja
- qt 5.* - qt 5.*

5
libs/libzmq/libzmq_cmake_version.patch
View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd3d8eb9..75c321fd 100644 index dd3d8eb9..c0187747 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -1,11 +1,7 @@ @@ -1,11 +1,8 @@
# CMake build script for ZeroMQ # CMake build script for ZeroMQ
project(ZeroMQ) project(ZeroMQ)
@ -12,6 +12,7 @@ index dd3d8eb9..75c321fd 100644
- cmake_minimum_required(VERSION 2.8.12) - cmake_minimum_required(VERSION 2.8.12)
-endif() -endif()
+cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.15)
+message(STATUS "Patched cmake version")
include(CheckIncludeFiles) include(CheckIncludeFiles)
include(CheckCCompilerFlag) include(CheckCCompilerFlag)