[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45106] trunk/blender/extern/libmv: fix for cmake error on non osx systems

Campbell Barton ideasman42 at gmail.com
Fri Mar 23 11:40:07 CET 2012


Revision: 45106
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45106
Author:   campbellbarton
Date:     2012-03-23 10:39:59 +0000 (Fri, 23 Mar 2012)
Log Message:
-----------
fix for cmake error on non osx systems

Modified Paths:
--------------
    trunk/blender/extern/libmv/CMakeLists.txt
    trunk/blender/extern/libmv/bundle.sh

Modified: trunk/blender/extern/libmv/CMakeLists.txt
===================================================================
--- trunk/blender/extern/libmv/CMakeLists.txt	2012-03-23 10:30:42 UTC (rev 45105)
+++ trunk/blender/extern/libmv/CMakeLists.txt	2012-03-23 10:39:59 UTC (rev 45106)
@@ -42,10 +42,12 @@
 
 # XXX - FIXME
 # this is a momentary hack to find unwind.h in 10.6.sdk
-if(${CMAKE_OSX_DEPLOYMENT_TARGET} STREQUAL "10.6")
-	list(APPEND INC_SYS
-		${CMAKE_OSX_SYSROOT}/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin10/4.2.1/include
-	)
+if(APPLE)
+	if(${CMAKE_OSX_DEPLOYMENT_TARGET} STREQUAL "10.6")
+		list(APPEND INC_SYS
+			${CMAKE_OSX_SYSROOT}/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin10/4.2.1/include
+		)
+	endif()	
 endif()
 # XXX - END
 

Modified: trunk/blender/extern/libmv/bundle.sh
===================================================================
--- trunk/blender/extern/libmv/bundle.sh	2012-03-23 10:30:42 UTC (rev 45105)
+++ trunk/blender/extern/libmv/bundle.sh	2012-03-23 10:39:59 UTC (rev 45106)
@@ -134,10 +134,12 @@
 
 # XXX - FIXME
 # this is a momentary hack to find unwind.h in 10.6.sdk
-if(\${CMAKE_OSX_DEPLOYMENT_TARGET} STREQUAL "10.6")
-	list(APPEND INC_SYS
-		\${CMAKE_OSX_SYSROOT}/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin10/4.2.1/include
-	)
+if(APPLE)
+	if(\${CMAKE_OSX_DEPLOYMENT_TARGET} STREQUAL "10.6")
+		list(APPEND INC_SYS
+			\${CMAKE_OSX_SYSROOT}/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin10/4.2.1/include
+		)
+	endif()
 endif()
 # XXX - END
 




More information about the Bf-blender-cvs mailing list