r19258 by craig - Comment out OSX SDK usage, and let the builder determine that on the installed OS
scribus-commit
scribus-commit at lists.scribus.net
Thu Jun 19 21:18:32 UTC 2014
Author: craig
Date: Thu Jun 19 21:18:32 2014
New Revision: 19258
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19258
Log:
Comment out OSX SDK usage, and let the builder determine that on the installed OS
Modified:
trunk/Scribus/CMakeLists.txt
Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19258&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Thu Jun 19 21:18:32 2014
@@ -366,34 +366,34 @@
ENDIF(APPLE_10_10_X)
IF(APPLE_10_9_X)
SET(OSXMINVER "10.9" CACHE TYPE STRING)
- SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk")
+ #SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk")
ENDIF(APPLE_10_9_X)
IF(APPLE_10_8_X)
SET(OSXMINVER "10.8" CACHE TYPE STRING)
- SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk")
+ #SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk")
ENDIF(APPLE_10_8_X)
IF(APPLE_10_7_X)
SET(OSXMINVER "10.7" CACHE TYPE STRING)
- SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk")
+ #SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk")
ENDIF(APPLE_10_7_X)
IF(APPLE_10_6_X)
SET(OSXMINVER "10.6" CACHE TYPE STRING)
- SET(CMAKE_OSX_SYSROOT "/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk")
+ #SET(CMAKE_OSX_SYSROOT "/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk")
ENDIF(APPLE_10_6_X)
IF(APPLE_10_5_X)
SET(OSXMINVER "10.5" CACHE TYPE STRING)
- SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.5.sdk")
+ #SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.5.sdk")
ENDIF(APPLE_10_5_X)
IF(APPLE_10_4_X)
SET(OSXMINVER "10.4" CACHE TYPE STRING)
- SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk")
+ #SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk")
ENDIF(APPLE_10_4_X)
# gcc/mac
IF(WANT_UNIVERSAL_BUNDLE)
MESSAGE("Setting Universal (PPC/i386) Architecture for OSX Build/Bundle")
SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" )
SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "ppc;i386" )
- SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk")
+ #SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk")
SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.4")
ELSE(WANT_UNIVERSAL_BUNDLE)
IF(ARCH_PPC OR ARCH_PPC_64)
More information about the scribus-commit
mailing list