forked from bartvdbraak/blender
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'
This commit is contained in:
parent
857dedbc58
commit
9978f97b12
@ -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")
|
set(PYTHON_NUMPY_PATH "" CACHE PATH "Python to python site-packages or dist-packages containing 'numpy' module")
|
||||||
mark_as_advanced(PYTHON_NUMPY_PATH)
|
mark_as_advanced(PYTHON_NUMPY_PATH)
|
||||||
|
|
||||||
option(WITH_MINGW64 "Use the 64-bit version of MinGW" OFF)
|
if(MINGW)
|
||||||
mark_as_advanced(WITH_MINGW64)
|
option(WITH_MINGW64 "Use the 64-bit version of MinGW" OFF)
|
||||||
|
mark_as_advanced(WITH_MINGW64)
|
||||||
|
endif()
|
||||||
|
|
||||||
# Cycles
|
# Cycles
|
||||||
option(WITH_CYCLES "Enable cycles Render Engine" ON)
|
option(WITH_CYCLES "Enable cycles Render Engine" ON)
|
||||||
|
@ -109,9 +109,12 @@ all:
|
|||||||
@echo
|
@echo
|
||||||
@echo Configuring Blender ...
|
@echo Configuring Blender ...
|
||||||
|
|
||||||
if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
|
# if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
|
||||||
$(CMAKE_CONFIG); \
|
# $(CMAKE_CONFIG); \
|
||||||
fi
|
# fi
|
||||||
|
|
||||||
|
# do this always incase of failed initial build, could be smarter here...
|
||||||
|
$(CMAKE_CONFIG)
|
||||||
|
|
||||||
@echo
|
@echo
|
||||||
@echo Building Blender ...
|
@echo Building Blender ...
|
||||||
|
@ -17,6 +17,7 @@ set(WITH_FFTW3 OFF CACHE FORCE BOOL)
|
|||||||
set(WITH_LIBMV OFF CACHE FORCE BOOL)
|
set(WITH_LIBMV OFF CACHE FORCE BOOL)
|
||||||
set(WITH_CARVE OFF CACHE FORCE BOOL)
|
set(WITH_CARVE OFF CACHE FORCE BOOL)
|
||||||
set(WITH_GAMEENGINE 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_IK_ITASC OFF CACHE FORCE BOOL)
|
||||||
set(WITH_IMAGE_CINEON OFF CACHE FORCE BOOL)
|
set(WITH_IMAGE_CINEON OFF CACHE FORCE BOOL)
|
||||||
set(WITH_IMAGE_DDS OFF CACHE FORCE BOOL)
|
set(WITH_IMAGE_DDS OFF CACHE FORCE BOOL)
|
||||||
|
Loading…
Reference in New Issue
Block a user