[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47063] trunk/blender: cmake edits

[Campbell Barton]

Revision: 47063
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47063
Author:   campbellbarton
Date:     2012-05-27 10:03:13 +0000 (Sun, 27 May 2012)
Log Message:
-----------
cmake edits
- only show mingw option when building with mingw
- always run cmake configure with convenience build targets so failed configurations stop re-configuring.
- disable WITH_GHOST_XDND in 'make lite'

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/GNUmakefile
    trunk/blender/build_files/cmake/config/blender_lite.cmake

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-05-27 00:36:50 UTC (rev 47062)
+++ trunk/blender/CMakeLists.txt	2012-05-27 10:03:13 UTC (rev 47063)
@@ -229,8 +229,10 @@
 set(PYTHON_NUMPY_PATH            "" CACHE PATH "Python to python site-packages or dist-packages containing 'numpy' module")
 mark_as_advanced(PYTHON_NUMPY_PATH)
 
-option(WITH_MINGW64                   "Use the 64-bit version of MinGW" OFF)
-mark_as_advanced(WITH_MINGW64)
+if(MINGW)
+	option(WITH_MINGW64                   "Use the 64-bit version of MinGW" OFF)
+	mark_as_advanced(WITH_MINGW64)
+endif()
 
 # Cycles
 option(WITH_CYCLES					"Enable cycles Render Engine" ON)

Modified: trunk/blender/GNUmakefile
===================================================================
--- trunk/blender/GNUmakefile	2012-05-27 00:36:50 UTC (rev 47062)
+++ trunk/blender/GNUmakefile	2012-05-27 10:03:13 UTC (rev 47063)
@@ -109,9 +109,12 @@
 	@echo
 	@echo Configuring Blender ...
 
-	if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
-		$(CMAKE_CONFIG); \
-	fi
+	# if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
+	# 	$(CMAKE_CONFIG); \
+	# fi
+	
+	# do this always incase of failed initial build, could be smarter here...
+	$(CMAKE_CONFIG)
 
 	@echo
 	@echo Building Blender ...

Modified: trunk/blender/build_files/cmake/config/blender_lite.cmake
===================================================================
--- trunk/blender/build_files/cmake/config/blender_lite.cmake	2012-05-27 00:36:50 UTC (rev 47062)
+++ trunk/blender/build_files/cmake/config/blender_lite.cmake	2012-05-27 10:03:13 UTC (rev 47063)
@@ -17,6 +17,7 @@
 set(WITH_LIBMV               OFF CACHE FORCE BOOL)
 set(WITH_CARVE               OFF CACHE FORCE BOOL)
 set(WITH_GAMEENGINE          OFF CACHE FORCE BOOL)
+set(WITH_GHOST_XDND          OFF CACHE FORCE BOOL)
 set(WITH_IK_ITASC            OFF CACHE FORCE BOOL)
 set(WITH_IMAGE_CINEON        OFF CACHE FORCE BOOL)
 set(WITH_IMAGE_DDS           OFF CACHE FORCE BOOL)