[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35611] trunk/blender/CMakeLists.txt: fix for building on ubuntu 11.04 (pre-release), also remove WITH_INSTALL from cache.

Campbell Barton ideasman42 at gmail.com
Fri Mar 18 13:12:54 CET 2011


Revision: 35611
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35611
Author:   campbellbarton
Date:     2011-03-18 12:12:53 +0000 (Fri, 18 Mar 2011)
Log Message:
-----------
fix for building on ubuntu 11.04 (pre-release), also remove WITH_INSTALL from cache.

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

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2011-03-18 10:35:17 UTC (rev 35610)
+++ trunk/blender/CMakeLists.txt	2011-03-18 12:12:53 UTC (rev 35611)
@@ -177,6 +177,9 @@
 	message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF")
 endif()
 
+# remove old vars
+unset(WITH_INSTALL CACHE)
+
 TEST_SSE_SUPPORT()
 
 #-----------------------------------------------------------------------------
@@ -213,6 +216,11 @@
 #Platform specifics
 
 if(UNIX AND NOT APPLE)
+	
+	# needed for ubuntu 11.04
+	if(EXISTS "/usr/lib/x86_64-linux-gnu")
+		set(CMAKE_LIBRARY_PATH "/usr/lib/x86_64-linux-gnu;${CMAKE_LIBRARY_PATH}")
+	endif()
 
 	if(WITH_OPENAL)
 		find_package(OpenAL)




More information about the Bf-blender-cvs mailing list