diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-11-12 17:52:04 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-11-22 19:38:15 +0300 |
| commit | 2ff1919b456b5c48bec8cb8914d2051e087e18e5 (patch) | |
| tree | 563522da9b7fc3c0ca9b8ed9f01e995e060da2a8 /GNUmakefile | |
| parent | 59aef0ad5d6440e855f53db791b28076f50df2b2 (diff) | |
Fix make BUILD_CMAKE_ARGS not combining with targets like ninja and lite
Previously make BUILD_CMAKE_ARGS="" on Linux and macOS would override any cmake
arguments that come from the targets. Now they are concatenated.
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/GNUmakefile b/GNUmakefile index accedbbbe4b..9b2ebad1e8e 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -163,9 +163,8 @@ CPU:=$(shell uname -m) BLENDER_DIR:=$(shell pwd -P) BUILD_TYPE:=Release -ifndef BUILD_CMAKE_ARGS - BUILD_CMAKE_ARGS:= -endif +# CMake arguments, assigned to local variable to make it mutable. +CMAKE_CONFIG_ARGS := $(BUILD_CMAKE_ARGS) ifndef BUILD_DIR BUILD_DIR:=$(shell dirname "$(BLENDER_DIR)")/build_$(OS_NCASE) @@ -213,34 +212,34 @@ ifneq "$(findstring debug, $(MAKECMDGOALS))" "" endif ifneq "$(findstring full, $(MAKECMDGOALS))" "" BUILD_DIR:=$(BUILD_DIR)_full - BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/blender_full.cmake" + CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/blender_full.cmake" $(CMAKE_CONFIG_ARGS) endif ifneq "$(findstring lite, $(MAKECMDGOALS))" "" BUILD_DIR:=$(BUILD_DIR)_lite - BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/blender_lite.cmake" + CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/blender_lite.cmake" $(CMAKE_CONFIG_ARGS) endif ifneq "$(findstring cycles, $(MAKECMDGOALS))" "" BUILD_DIR:=$(BUILD_DIR)_cycles - BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/cycles_standalone.cmake" + CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/cycles_standalone.cmake" $(CMAKE_CONFIG_ARGS) endif ifneq "$(findstring headless, $(MAKECMDGOALS))" "" BUILD_DIR:=$(BUILD_DIR)_headless - BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/blender_headless.cmake" + CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/blender_headless.cmake" $(CMAKE_CONFIG_ARGS) endif ifneq "$(findstring bpy, $(MAKECMDGOALS))" "" BUILD_DIR:=$(BUILD_DIR)_bpy - BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/bpy_module.cmake" + CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/bpy_module.cmake" $(CMAKE_CONFIG_ARGS) endif ifneq "$(findstring developer, $(MAKECMDGOALS))" "" - BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/blender_developer.cmake" + CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/blender_developer.cmake" $(CMAKE_CONFIG_ARGS) endif # ----------------------------------------------------------------------------- # build tool ifneq "$(findstring ninja, $(MAKECMDGOALS))" "" - BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -G Ninja + CMAKE_CONFIG_ARGS:=$(CMAKE_CONFIG_ARGS) -G Ninja BUILD_COMMAND:=ninja DEPS_BUILD_COMMAND:=ninja else @@ -288,7 +287,7 @@ endif # ----------------------------------------------------------------------------- # Macro for configuring cmake -CMAKE_CONFIG = cmake $(BUILD_CMAKE_ARGS) \ +CMAKE_CONFIG = cmake $(CMAKE_CONFIG_ARGS) \ -H"$(BLENDER_DIR)" \ -B"$(BUILD_DIR)" \ -DCMAKE_BUILD_TYPE_INIT:STRING=$(BUILD_TYPE) |