[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41791] trunk/blender/GNUmakefile: allow passing vars to cmake from our makefile

Campbell Barton ideasman42 at gmail.com
Sun Nov 13 15:29:17 CET 2011


Revision: 41791
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41791
Author:   campbellbarton
Date:     2011-11-13 14:29:17 +0000 (Sun, 13 Nov 2011)
Log Message:
-----------
allow passing vars to cmake from our makefile

Modified Paths:
--------------
    trunk/blender/GNUmakefile

Modified: trunk/blender/GNUmakefile
===================================================================
--- trunk/blender/GNUmakefile	2011-11-13 14:16:43 UTC (rev 41790)
+++ trunk/blender/GNUmakefile	2011-11-13 14:29:17 UTC (rev 41791)
@@ -34,8 +34,11 @@
 # Source and Build DIR's
 BLENDER_DIR:=$(shell pwd -P)
 BUILD_TYPE:=Release
-BUILD_CMAKE_ARGS:=
 
+ifndef BUILD_CMAKE_ARGS
+	BUILD_CMAKE_ARGS:=
+endif
+
 ifndef BUILD_DIR
 	BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
 endif
@@ -123,6 +126,7 @@
 	@echo "  * bpy       - build as a python module which can be loaded from python directly"
 	@echo ""
 	@echo "  Note, passing the argument 'BUILD_DIR=path' when calling make will override the default build dir."
+	@echo "  Note, passing the argument 'BUILD_CMAKE_ARGS=args' lets you add cmake arguments."
 	@echo ""
 	@echo ""
 	@echo "Project Files for IDE's"




More information about the Bf-blender-cvs mailing list