Skip to content

Commit a522ef1

Browse files
committed
depends: add zeromq cmake minimum patch
1 parent cbbc229 commit a522ef1

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

depends/packages/zeromq.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ $(package)_patches = remove_libstd_link.patch
77
$(package)_patches += macos_mktemp_check.patch
88
$(package)_patches += builtin_sha1.patch
99
$(package)_patches += fix_have_windows.patch
10+
$(package)_patches += cmake_minimum.patch
1011

1112
define $(package)_set_vars
1213
$(package)_config_opts = --without-docs --disable-shared --disable-valgrind
@@ -20,7 +21,8 @@ define $(package)_preprocess_cmds
2021
patch -p1 < $($(package)_patch_dir)/remove_libstd_link.patch && \
2122
patch -p1 < $($(package)_patch_dir)/macos_mktemp_check.patch && \
2223
patch -p1 < $($(package)_patch_dir)/builtin_sha1.patch && \
23-
patch -p1 < $($(package)_patch_dir)/fix_have_windows.patch
24+
patch -p1 < $($(package)_patch_dir)/fix_have_windows.patch && \
25+
patch -p1 < $($(package)_patch_dir)/cmake_minimum.patch
2426
endef
2527

2628
define $(package)_config_cmds
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
Set a more sane cmake_minimum_required.
2+
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -1,12 +1,7 @@
6+
# CMake build script for ZeroMQ
7+
+cmake_minimum_required(VERSION 3.16)
8+
project(ZeroMQ)
9+
10+
-if(${CMAKE_SYSTEM_NAME} STREQUAL Darwin)
11+
- cmake_minimum_required(VERSION 3.0.2)
12+
-else()
13+
- cmake_minimum_required(VERSION 2.8.12)
14+
-endif()
15+
-
16+
include(CheckIncludeFiles)
17+
include(CheckCCompilerFlag)
18+
include(CheckCXXCompilerFlag)

0 commit comments

Comments
 (0)