diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-21 16:15:02 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-21 16:15:02 +0400 |
| commit | f127a0cd6f998c6b7975cfbe13f5144957fdcf67 (patch) | |
| tree | 3f961e94de3470d8e9bca171488d433b0d32639e /extern | |
| parent | b15255e820f64d8280cb4611a1fcf5a7725d8e08 (diff) | |
modify osx CMake hack so the CMake files can be parsed more easily by naive my error checker.
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/libmv/CMakeLists.txt | 14 | ||||
| -rwxr-xr-x | extern/libmv/bundle.sh | 14 |
2 files changed, 22 insertions, 6 deletions
diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt index c16d842dd65..a3a210eb436 100644 --- a/extern/libmv/CMakeLists.txt +++ b/extern/libmv/CMakeLists.txt @@ -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 diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh index fbf4364f7fe..2f9357a2fe1 100755 --- a/extern/libmv/bundle.sh +++ b/extern/libmv/bundle.sh @@ -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} |