diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d6947522..b1d035d76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,19 +41,19 @@ endif() # Patch libzmq to set minimum cmake version to 3.15 to avoid warnings # 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") if(SLS_FETCH_ZMQ_FROM_GITHUB) # Opt in to pull down a zmq version from github instead of - # using the bundled verison + # using the bundled version FetchContent_Declare( libzmq GIT_REPOSITORY https://github.com/zeromq/libzmq.git GIT_TAG v${SLS_LIBZMQ_VERSION} - PATCH_COMMAND ${ZMQ_PATCH_CMAKE} + PATCH_COMMAND ${CMAKE_COMMAND} -E chdir patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/libs/libzmq/libzmq_cmake_version.patch + UPDATE_DISCONNECTED 1 ) else() # Standard behaviour use libzmq included in this repo (libs/libzmq) @@ -61,7 +61,8 @@ else() libzmq URL ${CMAKE_CURRENT_SOURCE_DIR}/libs/libzmq/libzmq-${SLS_LIBZMQ_VERSION}.tar.gz URL_HASH MD5=cc20b769ac10afa352e5ed2769bb23b3 - PATCH_COMMAND ${ZMQ_PATCH_CMAKE} + PATCH_COMMAND ${CMAKE_COMMAND} -E chdir patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/libs/libzmq/libzmq_cmake_version.patch + UPDATE_DISCONNECTED 1 ) endif() diff --git a/conda-recipes/main-library/meta.yaml b/conda-recipes/main-library/meta.yaml index 87a9a4f50..2ddc76a6f 100755 --- a/conda-recipes/main-library/meta.yaml +++ b/conda-recipes/main-library/meta.yaml @@ -17,7 +17,7 @@ requirements: - {{ compiler('c') }} - {{ stdlib("c") }} - {{ compiler('cxx') }} - + - git - cmake - ninja - qt 5.* diff --git a/libs/libzmq/libzmq_cmake_version.patch b/libs/libzmq/libzmq_cmake_version.patch index 901078fe8..4e421d322 100644 --- a/libs/libzmq/libzmq_cmake_version.patch +++ b/libs/libzmq/libzmq_cmake_version.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index dd3d8eb9..75c321fd 100644 +index dd3d8eb9..c0187747 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,11 +1,7 @@ +@@ -1,11 +1,8 @@ # CMake build script for ZeroMQ project(ZeroMQ) @@ -12,6 +12,7 @@ index dd3d8eb9..75c321fd 100644 - cmake_minimum_required(VERSION 2.8.12) -endif() +cmake_minimum_required(VERSION 3.15) ++message(STATUS "Patched cmake version") include(CheckIncludeFiles) include(CheckCCompilerFlag)