diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-13 18:16:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-13 18:16:43 +0400 |
| commit | 7d0b5920c6d5d2bd889eab55679adaf39d146028 (patch) | |
| tree | 13aa04d34e1e4a4615ae7089ccb9c552fa3dad39 /CMakeLists.txt | |
| parent | 7edd4f93f162ea86730b65fda6a6b858f7121c34 (diff) | |
rename cmake WITH_OCEANSIM --> WITH_MOD_OCEANSIM and tag CYCLES_CUDA_BINARIES_ARCH as advanced.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 40239a16f02..6f8e72f7494 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -171,7 +171,7 @@ option(WITH_MOD_DECIMATE "Enable Decimate Modifier" ON) option(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON) option(WITH_MOD_CLOTH_ELTOPO "Enable Experemental cloth solver" OFF) 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 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_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") +mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH) # disable for now, but plan to support on all platforms eventually 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.") endif() -if(NOT WITH_FFTW3 AND WITH_OCEANSIM) - message(FATAL_ERROR "WITH_OCEANSIM requires WITH_FFTW3 to be ON") +if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM) + message(FATAL_ERROR "WITH_MOD_OCEANSIM requires WITH_FFTW3 to be ON") endif() # 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_DECIMATE) info_cfg_option(WITH_MOD_FLUID) - info_cfg_option(WITH_OCEANSIM) + info_cfg_option(WITH_MOD_OCEANSIM) info_cfg_text("") |