mirror of
https://github.com/mkxp-z/mkxp-z.git
synced 2025-07-01 14:15:16 +02:00
Use environment variable to set CMake policy instead of -D flag
This applies recursively unlike the other method.
This commit is contained in:
parent
93c3e972d5
commit
97235e068a
3 changed files with 3 additions and 5 deletions
|
@ -24,6 +24,7 @@ CLONE := $(GIT) clone -q
|
|||
GITHUB := https://github.com
|
||||
|
||||
CONFIGURE_ENV := \
|
||||
CMAKE_POLICY_VERSION_MINIMUM=3.10 \
|
||||
PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR) \
|
||||
CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
|
||||
|
||||
|
@ -33,7 +34,6 @@ ifdef ARCH_CMAKE_TOOLCHAIN
|
|||
ARCH_CMAKE_ARGS := -DCMAKE_TOOLCHAIN_FILE="${PWD}/$(ARCH_CMAKE_TOOLCHAIN)"
|
||||
endif
|
||||
CMAKE_ARGS := \
|
||||
-DCMAKE_POLICY_VERSION_MINIMUM=3.10 \
|
||||
-DCMAKE_INSTALL_PREFIX="$(BUILD_PREFIX)" \
|
||||
-DCMAKE_PREFIX_PATH="$(BUILD_PREFIX)" \
|
||||
-DCMAKE_C_FLAGS="$(CFLAGS)" \
|
||||
|
@ -303,7 +303,6 @@ $(DOWNLOADS)/fluidsynth/cmakebuild/Makefile: $(DOWNLOADS)/fluidsynth/CMakeLists.
|
|||
|
||||
$(DOWNLOADS)/fluidsynth/CMakeLists.txt:
|
||||
$(CLONE) $(GITHUB)/mkxp-z/fluidsynth-sans-glib $(DOWNLOADS)/fluidsynth
|
||||
sed -i 's/"$${CMAKE_COMMAND}" -D/"$${CMAKE_COMMAND}" -DCMAKE_POLICY_VERSION_MINIMUM=3.10 -D/g' $(DOWNLOADS)/fluidsynth/src/CMakeLists.txt
|
||||
|
||||
# OpenSSL
|
||||
openssl: init_dirs $(LIBDIR)/libssl.a
|
||||
|
|
|
@ -23,6 +23,7 @@ endif
|
|||
|
||||
CONFIGURE_ENV := \
|
||||
$(DEPLOYMENT_TARGET_ENV) \
|
||||
CMAKE_POLICY_VERSION_MINIMUM=3.10 \
|
||||
PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR) \
|
||||
CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
|
||||
|
||||
|
@ -31,7 +32,6 @@ CONFIGURE_ARGS := \
|
|||
--host=$(HOST)
|
||||
|
||||
CMAKE_ARGS := \
|
||||
-DCMAKE_POLICY_VERSION_MINIMUM=3.10 \
|
||||
-DCMAKE_INSTALL_PREFIX="$(BUILD_PREFIX)" \
|
||||
-DCMAKE_PREFIX_PATH="$(BUILD_PREFIX)" \
|
||||
-DCMAKE_OSX_ARCHITECTURES=$(ARCH) \
|
||||
|
|
|
@ -23,13 +23,13 @@ CLONE := $(GIT) clone -q
|
|||
GITHUB := https://github.com
|
||||
|
||||
CONFIGURE_ENV := \
|
||||
CMAKE_POLICY_VERSION_MINIMUM=3.10 \
|
||||
PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR) \
|
||||
CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
|
||||
|
||||
CONFIGURE_ARGS := --prefix="$(BUILD_PREFIX)"
|
||||
|
||||
CMAKE_ARGS := \
|
||||
-DCMAKE_POLICY_VERSION_MINIMUM=3.10 \
|
||||
-DCMAKE_INSTALL_PREFIX="$(BUILD_PREFIX)" \
|
||||
-DCMAKE_PREFIX_PATH="$(BUILD_PREFIX)" \
|
||||
-DCMAKE_C_FLAGS="$(CFLAGS)" \
|
||||
|
@ -283,7 +283,6 @@ $(DOWNLOADS)/fluidsynth/cmakebuild/Makefile: $(DOWNLOADS)/fluidsynth/CMakeLists.
|
|||
|
||||
$(DOWNLOADS)/fluidsynth/CMakeLists.txt:
|
||||
$(CLONE) $(GITHUB)/mkxp-z/fluidsynth-sans-glib $(DOWNLOADS)/fluidsynth
|
||||
sed -i 's/"$${CMAKE_COMMAND}" -D/"$${CMAKE_COMMAND}" -DCMAKE_POLICY_VERSION_MINIMUM=3.10 -D/g' $(DOWNLOADS)/fluidsynth/src/CMakeLists.txt
|
||||
|
||||
# OpenSSL
|
||||
openssl: init_dirs $(LIBDIR)/libssl.a
|
||||
|
|
Loading…
Add table
Reference in a new issue