Revision: 41790
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41790
Author: campbellbarton
Date: 2011-11-13 14:16:43 +0000 (Sun, 13 Nov 2011)
Log Message:
-----------
rename cmake WITH_OCEANSIM --> WITH_MOD_OCEANSIM and tag
CYCLES_CUDA_BINARIES_ARCH as advanced.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/build_files/cmake/config/blender_lite.cmake
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/modifiers/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-11-13 14:11:02 UTC (rev 41789)
+++ trunk/blender/CMakeLists.txt 2011-11-13 14:16:43 UTC (rev 41790)
@@ -171,7 +171,7 @@
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_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 @@
"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 @@
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("")
Modified: trunk/blender/build_files/cmake/config/blender_lite.cmake
===================================================================
--- trunk/blender/build_files/cmake/config/blender_lite.cmake 2011-11-13
14:11:02 UTC (rev 41789)
+++ trunk/blender/build_files/cmake/config/blender_lite.cmake 2011-11-13
14:16:43 UTC (rev 41790)
@@ -34,6 +34,7 @@
set(WITH_MOD_DECIMATE OFF CACHE FORCE BOOL)
set(WITH_MOD_FLUID 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_OPENAL OFF CACHE FORCE BOOL)
set(WITH_OPENCOLLADA OFF CACHE FORCE BOOL)
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-11-13
14:11:02 UTC (rev 41789)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-11-13
14:16:43 UTC (rev 41790)
@@ -343,7 +343,7 @@
add_definitions(-DWITH_SMOKE)
endif()
-if(WITH_OCEANSIM)
+if(WITH_MOD_OCEANSIM)
add_definitions(-DWITH_OCEANSIM)
endif()
Modified: trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2011-11-13
14:11:02 UTC (rev 41789)
+++ trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2011-11-13
14:16:43 UTC (rev 41790)
@@ -206,7 +206,7 @@
add_definitions(-DWITH_FFTW3)
endif()
-if(WITH_OCEANSIM)
+if(WITH_MOD_OCEANSIM)
add_definitions(-DWITH_OCEANSIM)
endif()
Modified: trunk/blender/source/blender/modifiers/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/modifiers/CMakeLists.txt 2011-11-13
14:11:02 UTC (rev 41789)
+++ trunk/blender/source/blender/modifiers/CMakeLists.txt 2011-11-13
14:16:43 UTC (rev 41790)
@@ -117,7 +117,7 @@
add_definitions(-DWITH_MOD_FLUID)
endif()
-if(WITH_OCEANSIM)
+if(WITH_MOD_OCEANSIM)
add_definitions(-DWITH_OCEANSIM)
endif()
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
