Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 14696 → Rev 14697

/branches/Version135/Scribus/CMakeLists.txt
348,7 → 348,7
IF(APPLE)
IF(APPLE_10_6_X)
SET(OSXMINVER "10.6" CACHE TYPE STRING)
ELSEIF (APPLE_10_6_X)
ELSE(APPLE_10_6_X)
SET(OSXMINVER "10.4" CACHE TYPE STRING)
ENDIF(APPLE_10_6_X)
# gcc/mac
356,6 → 356,7
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_DEPLOYMENT_TARGET "10.4")
SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk")
ELSE(WANT_UNIVERSAL_BUNDLE)
IF(ARCH_PPC OR ARCH_PPC_64)
367,14 → 368,17
MESSAGE("Setting x86_64 Architecture for OSX Build/Bundle")
SET(CMAKE_OSX_ARCHITECTURES "x86_64" )
SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "x86_64" )
# SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.6")
ELSE(APPLE_10_6_X)
MESSAGE("Setting i386 Architecture for OSX Build/Bundle")
SET(CMAKE_OSX_ARCHITECTURES "i386" )
SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "i386" )
# SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.4")
ENDIF(APPLE_10_6_X)
ENDIF(ARCH_PPC OR ARCH_PPC_64)
ENDIF(WANT_UNIVERSAL_BUNDLE)
MESSAGE(STATUS "${CMAKE_OSX_ARCHITECTURES} ${CMAKE_OSX_SYSROOT}")
MESSAGE(STATUS "OSX Minimum Version: ${OSXMINVER}")
SET(ENV{MACOSX_DEPLOYMENT_TARGET} ${OSXMINVER} )
SET( ENV{LD_PREBIND} 1 )
SET( ENV{LD_PREBIND_ALLOW_OVERLAP} 1 )