[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35581] trunk/blender: remove cmake WITH_INSTALL option since its a target now.
Campbell Barton
ideasman42 at gmail.com
Wed Mar 16 22:32:21 CET 2011
Revision: 35581
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35581
Author: campbellbarton
Date: 2011-03-16 21:32:20 +0000 (Wed, 16 Mar 2011)
Log Message:
-----------
remove cmake WITH_INSTALL option since its a target now.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/source/tests/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-03-16 21:20:24 UTC (rev 35580)
+++ trunk/blender/CMakeLists.txt 2011-03-16 21:32:20 UTC (rev 35581)
@@ -125,7 +125,6 @@
# Misc
option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON)
-option(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON)
if(UNIX AND NOT APPLE)
option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
endif()
@@ -161,10 +160,6 @@
message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
endif()
-if(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
- message("WARNING: WITH_PYTHON_INSTALL requires WITH_INSTALL")
-endif()
-
if(NOT WITH_SAMPLERATE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK require WITH_SAMPLERATE")
endif()
Modified: trunk/blender/source/tests/CMakeLists.txt
===================================================================
--- trunk/blender/source/tests/CMakeLists.txt 2011-03-16 21:20:24 UTC (rev 35580)
+++ trunk/blender/source/tests/CMakeLists.txt 2011-03-16 21:32:20 UTC (rev 35581)
@@ -20,7 +20,7 @@
#
# ***** END GPL LICENSE BLOCK *****
-# --env-system-scripts allows to run without WITH_INSTALL
+# --env-system-scripts allows to run without the install target.
# Use '--write-blend=/tmp/test.blend' to view output
More information about the Bf-blender-cvs
mailing list