Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rename cmake WITH_OCEANSIM --> WITH_MOD_OCEANSIM and tag CYCLES_CUDA_BINARIES_ARCH as advanced.

Browse Source
This commit is contained in:
Campbell Barton
2011-11-13 14:16:43 +00:00
parent 7edd4f93f1
commit 7d0b5920c6
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@@ -171,7 +171,7 @@ option(WITH_MOD_DECIMATE "Enable Decimate Modifier" ON)
option(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON) option(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON)
option(WITH_MOD_CLOTH_ELTOPO "Enable Experemental cloth solver" OFF) option(WITH_MOD_CLOTH_ELTOPO "Enable Experemental cloth solver" OFF)
mark_as_advanced(WITH_MOD_CLOTH_ELTOPO) mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
option(WITH_OCEANSIM "Enable Ocean Modifier" OFF) option(WITH_MOD_OCEANSIM "Enable Ocean Modifier" OFF)
# Image format support # Image format support
option(WITH_IMAGE_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON) option(WITH_IMAGE_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
@@ -219,6 +219,7 @@ option(WITH_CYCLES "Enable cycles Render Engine" ON)
option(WITH_CYCLES_TEST "Build cycles test application" OFF) option(WITH_CYCLES_TEST "Build cycles test application" OFF)
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF) option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build binaries for") set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build binaries for")
mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
# disable for now, but plan to support on all platforms eventually # disable for now, but plan to support on all platforms eventually
option(WITH_MEM_JEMALLOC "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF) option(WITH_MEM_JEMALLOC "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)
@@ -286,8 +287,8 @@ if(WITH_CODEC_QUICKTIME AND MINGW)
"line if youre a developer who wants to add support.") "line if youre a developer who wants to add support.")
endif() endif()
if(NOT WITH_FFTW3 AND WITH_OCEANSIM) if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM)
message(FATAL_ERROR "WITH_OCEANSIM requires WITH_FFTW3 to be ON") message(FATAL_ERROR "WITH_MOD_OCEANSIM requires WITH_FFTW3 to be ON")
endif() endif()
# may as well build python module without a UI # may as well build python module without a UI
@@ -1567,7 +1568,7 @@ if(FIRST_RUN)
info_cfg_option(WITH_MOD_BOOLEAN) info_cfg_option(WITH_MOD_BOOLEAN)
info_cfg_option(WITH_MOD_DECIMATE) info_cfg_option(WITH_MOD_DECIMATE)
info_cfg_option(WITH_MOD_FLUID) info_cfg_option(WITH_MOD_FLUID)
info_cfg_option(WITH_OCEANSIM) info_cfg_option(WITH_MOD_OCEANSIM)
info_cfg_text("") info_cfg_text("")

1
build_files/cmake/config/blender_lite.cmake
View File

@@ -34,6 +34,7 @@ set(WITH_MOD_BOOLEAN OFF CACHE FORCE BOOL)
set(WITH_MOD_DECIMATE OFF CACHE FORCE BOOL) set(WITH_MOD_DECIMATE OFF CACHE FORCE BOOL)
set(WITH_MOD_FLUID OFF CACHE FORCE BOOL) set(WITH_MOD_FLUID OFF CACHE FORCE BOOL)
set(WITH_MOD_SMOKE OFF CACHE FORCE BOOL) set(WITH_MOD_SMOKE OFF CACHE FORCE BOOL)
set(WITH_MOD_OCEANSIM OFF CACHE FORCE BOOL)
set(WITH_AUDASPACE OFF CACHE FORCE BOOL) set(WITH_AUDASPACE OFF CACHE FORCE BOOL)
set(WITH_OPENAL OFF CACHE FORCE BOOL) set(WITH_OPENAL OFF CACHE FORCE BOOL)
set(WITH_OPENCOLLADA OFF CACHE FORCE BOOL) set(WITH_OPENCOLLADA OFF CACHE FORCE BOOL)

2
source/blender/blenkernel/CMakeLists.txt
View File

@@ -343,7 +343,7 @@ if(WITH_MOD_SMOKE)
add_definitions(-DWITH_SMOKE) add_definitions(-DWITH_SMOKE)
endif() endif()
if(WITH_OCEANSIM) if(WITH_MOD_OCEANSIM)
add_definitions(-DWITH_OCEANSIM) add_definitions(-DWITH_OCEANSIM)
endif() endif()

2
source/blender/makesrna/intern/CMakeLists.txt
View File

@@ -206,7 +206,7 @@ if(WITH_FFTW3)
add_definitions(-DWITH_FFTW3) add_definitions(-DWITH_FFTW3)
endif() endif()
if(WITH_OCEANSIM) if(WITH_MOD_OCEANSIM)
add_definitions(-DWITH_OCEANSIM) add_definitions(-DWITH_OCEANSIM)
endif() endif()

2
source/blender/modifiers/CMakeLists.txt
View File

@@ -117,7 +117,7 @@ if(WITH_MOD_FLUID)
add_definitions(-DWITH_MOD_FLUID) add_definitions(-DWITH_MOD_FLUID)
endif() endif()
if(WITH_OCEANSIM) if(WITH_MOD_OCEANSIM)
add_definitions(-DWITH_OCEANSIM) add_definitions(-DWITH_OCEANSIM)
endif() endif()