Skip to content

Commit 63c0c4f

Browse files
committed
depends: reuse _config_opts for CMake options
This will allow us to use the existing machinery for filtering by arch, os, debug/release, etc. For example, the following becomes possible for libevent: $(package)_config_opts_release=-DEVENT__DISABLE_DEBUG_MODE Now the define is only set when not building depends with DEBUG=1
1 parent d26a71a commit 63c0c4f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

depends/funcs.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ $(1)_cmake=env CC="$$($(1)_cc)" \
176176
CXX="$$($(1)_cxx)" \
177177
CXXFLAGS="$$($(1)_cppflags) $$($(1)_cxxflags)" \
178178
LDFLAGS="$$($(1)_ldflags)" \
179-
cmake -DCMAKE_INSTALL_PREFIX:PATH="$$($($(1)_type)_prefix)" $$($(1)_cmake_opts)
179+
cmake -DCMAKE_INSTALL_PREFIX:PATH="$$($($(1)_type)_prefix)" $$($(1)_config_opts)
180180
ifeq ($($(1)_type),build)
181181
$(1)_cmake += -DCMAKE_INSTALL_RPATH:PATH="$$($($(1)_type)_prefix)/lib"
182182
else

depends/packages/libmultiprocess.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ endif
1010

1111
define $(package)_set_vars :=
1212
ifneq ($(host),$(build))
13-
$(package)_cmake_opts := -DCAPNP_EXECUTABLE="$$(native_capnp_prefixbin)/capnp"
14-
$(package)_cmake_opts += -DCAPNPC_CXX_EXECUTABLE="$$(native_capnp_prefixbin)/capnpc-c++"
13+
$(package)_config_opts := -DCAPNP_EXECUTABLE="$$(native_capnp_prefixbin)/capnp"
14+
$(package)_config_opts += -DCAPNPC_CXX_EXECUTABLE="$$(native_capnp_prefixbin)/capnpc-c++"
1515
endif
1616
endef
1717

0 commit comments

Comments
 (0)