cmake edits
authorCampbell Barton <ideasman42@gmail.com>
Sun, 27 May 2012 10:03:13 +0000 (10:03 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 27 May 2012 10:03:13 +0000 (10:03 +0000)
- 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'

CMakeLists.txt
GNUmakefile
build_files/cmake/config/blender_lite.cmake

index 89fe482d7ec3e2e9227a68a551c6a529309439ab..038d6a075ddcb39aa4cb4fdc95a6119152ffc1ee 100644 (file)
@@ -229,8 +229,10 @@ option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install fol
 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)
index f2ac02854079151d0d26b0223b070b0689e1c9f8..f5cba00d45213ab65366b05715e16d7468027244 100644 (file)
@@ -109,9 +109,12 @@ all:
        @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 ...
index e72a0fff355f08143dc8191a4dd59077145204f6..d19f0cf32e867080cd65b62debad5e77c91490b2 100644 (file)
@@ -17,6 +17,7 @@ set(WITH_FFTW3               OFF CACHE FORCE BOOL)
 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)