griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

modify osx CMake hack so the CMake files can be parsed more easily by naive my error checker.

Browse Source
This commit is contained in:
Campbell Barton
2012-03-21 12:15:02 +00:00
parent b15255e820
commit f127a0cd6f
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
extern/libmv/CMakeLists.txt vendored
View File

@@ -37,11 +37,19 @@ set(INC
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

14
extern/libmv/bundle.sh vendored
View File

@@ -129,11 +129,19 @@ set(INC
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}