[Bf-blender-cvs] [c3788b6] master: Convenience Makefile: spaces in the build path would fail still.
Campbell Barton
noreply at git.blender.org
Sun Nov 17 11:18:45 CET 2013
Commit: c3788b60f4af8ede604375e9f5275691bc7fa7f2
Author: Campbell Barton
Date: Sun Nov 17 21:16:39 2013 +1100
http://developer.blender.org/rBc3788b60f4af8ede604375e9f5275691bc7fa7f2
Convenience Makefile: spaces in the build path would fail still.
===================================================================
M GNUmakefile
===================================================================
diff --git a/GNUmakefile b/GNUmakefile
index 11ae1ff..e6998cf 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -54,15 +54,15 @@ ifneq "$(findstring debug, $(MAKECMDGOALS))" ""
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
+ BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/blender_lite.cmake"
endif
ifneq "$(findstring headless, $(MAKECMDGOALS))" ""
BUILD_DIR:=$(BUILD_DIR)_bpy
- BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C$(BLENDER_DIR)/build_files/cmake/config/blender_headless.cmake
+ BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/blender_headless.cmake"
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
+ BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/bpy_module.cmake"
endif
@@ -118,7 +118,7 @@ all:
@echo
@echo Building Blender ...
- $(MAKE) -C $(BUILD_DIR) -s -j $(NPROCS) install
+ $(MAKE) -C "$(BUILD_DIR)" -s -j $(NPROCS) install
@echo
@echo edit build configuration with: "$(BUILD_DIR)/CMakeCache.txt" run make again to rebuild.
@echo blender installed, run from: "$(BUILD_DIR)/bin/blender"
More information about the Bf-blender-cvs
mailing list