[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45060] trunk/blender/extern/libmv: modify osx CMake hack so the CMake files can be parsed more easily by naive my error checker .

[Campbell Barton]

Revision: 45060
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45060
Author:   campbellbarton
Date:     2012-03-21 12:15:02 +0000 (Wed, 21 Mar 2012)
Log Message:
-----------
modify osx CMake hack so the CMake files can be parsed more easily by naive my error checker.

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-21 12:08:16 UTC (rev 45059)
+++ trunk/blender/extern/libmv/CMakeLists.txt	2012-03-21 12:15:02 UTC (rev 45060)
@@ -37,11 +37,19 @@
 set(INC_SYS
 	${PNG_INCLUDE_DIR}
 	${ZLIB_INCLUDE_DIRS}
-	if(${CMAKE_OSX_DEPLOYMENT_TARGET} STREQUAL "10.6") # this is a momentary hack to find unwind.h in 10.6.sdk
-		${CMAKE_OSX_SYSROOT}/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin10/4.2.1/include
-	endif()
 )
 
+
+# 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
+	)
+endif()
+# XXX - END
+
+
 set(SRC
 	libmv-capi.cpp
 	libmv/image/array_nd.cc

Modified: trunk/blender/extern/libmv/bundle.sh
===================================================================
--- trunk/blender/extern/libmv/bundle.sh	2012-03-21 12:08:16 UTC (rev 45059)
+++ trunk/blender/extern/libmv/bundle.sh	2012-03-21 12:15:02 UTC (rev 45060)
@@ -129,11 +129,19 @@
 set(INC_SYS
 	\${PNG_INCLUDE_DIR}
 	\${ZLIB_INCLUDE_DIRS}
-	if(\${CMAKE_OSX_DEPLOYMENT_TARGET} STREQUAL "10.6") # this is a momentary hack to find unwind.h in 10.6.sdk
-		\${CMAKE_OSX_SYSROOT}/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin10/4.2.1/include
-	endif()
 )
 
+
+# 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
+	)
+endif()
+# XXX - END
+
+
 set(SRC
 	libmv-capi.cpp
 ${sources}