[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41674] trunk/blender/CMakeLists.txt: stop cmake from overwriting BOOST_ROOT and OPENIMAGEIO_ROOT_DIR which the builder is supposed to be able to set .

[Campbell Barton]

Revision: 41674
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41674
Author:   campbellbarton
Date:     2011-11-08 18:15:53 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------
stop cmake from overwriting BOOST_ROOT and OPENIMAGEIO_ROOT_DIR which the builder is supposed to be able to set.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2011-11-08 17:53:49 UTC (rev 41673)
+++ trunk/blender/CMakeLists.txt	2011-11-08 18:15:53 UTC (rev 41674)
@@ -502,13 +502,19 @@
 	endif()
 
 	if(WITH_BOOST)
-		set(BOOST "/usr" CACHE PATH "Boost Directory")
+		
+		# not sure this is needed, commenting, campbell
+		# ---
+		# set(BOOST "/usr" CACHE PATH "Boost Directory")
+		# 
+		# if(NOT BOOST_CUSTOM)
+		# 	set(BOOST_ROOT ${BOOST})
+		# 	set(Boost_USE_MULTITHREADED ON)
+		# 	find_package(Boost 1.34 COMPONENTS filesystem regex system thread)
+		# endif()
 
-		if(NOT BOOST_CUSTOM)
-			set(BOOST_ROOT ${BOOST})
-			set(Boost_USE_MULTITHREADED ON)
-			find_package(Boost 1.34 COMPONENTS filesystem regex system thread)
-		endif()
+		set(Boost_USE_MULTITHREADED ON)
+		find_package(Boost 1.34 COMPONENTS filesystem regex system thread)
 
 		set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
 		set(BOOST_LIBRARIES ${Boost_LIBRARIES})
@@ -517,8 +523,6 @@
 	endif()
 
 	if(WITH_OPENIMAGEIO)
-		set(OPENIMAGEIO "/usr" CACHE PATH "OpenImageIO Directory")
-
 		find_package(OpenImageIO)
 
 		set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})