Author: craig
Date: Tue Jun 30 16:47:41 2020
New Revision: 23908
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23908
Log:
Add some early code to support Mac OS Big Sur based on beta installation
tests
Modified:
trunk/Scribus/CMakeLists.txt
trunk/Scribus/CMakeLists_Apple.cmake
Modified: trunk/Scribus/CMakeLists.txt
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23908&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Tue Jun 30 16:47:41 2020
@@ -160,6 +160,12 @@
set(ARCH_HPPA ON)
endif()
+string(REGEX MATCH "(arm*)" _machine_arm "${MACHINE}")
+if (_machine_arm)
+ message(STATUS "Found target arm")
+ set(ARCH_ARM ON)
+endif()
+
# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. See:
# http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3 and
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559133
@@ -167,53 +173,66 @@
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
## Do our Apple OSX version setup
-if ((APPLE) AND (CMAKE_SIZEOF_VOID_P EQUAL 8) AND (ARCH_X86 OR ARCH_X86_64))
- string(REGEX REPLACE ".*-darwin([0-9]+).*" "\\1" _apple_ver
"${MACHINE}")
- if (_apple_ver EQUAL "19")
- message(STATUS "Found macOS Catalina Target: Apple, 64 bit,
X86")
- set(APPLE_10_15_X ON CACHE BOOL "Found macOS Catalina Target:
Apple, 64 bit, X86")
- endif()
- if (_apple_ver EQUAL "18")
- message(STATUS "Found macOS Mojave Target: Apple, 64 bit, X86")
- set(APPLE_10_14_X ON CACHE BOOL "Found macOS Mojave Target:
Apple, 64 bit, X86")
- endif()
- if (_apple_ver EQUAL "17")
- message(STATUS "Found macOS High Sierra Target: Apple, 64 bit,
X86")
- set(APPLE_10_13_X ON CACHE BOOL "Found macOS High Sierra
Target: Apple, 64 bit, X86")
- endif()
- if (_apple_ver EQUAL "16")
- message(STATUS "Found macOS Sierra Target: Apple, 64 bit, X86")
- set(APPLE_10_12_X ON CACHE BOOL "Found macOS Sierra Target:
Apple, 64 bit, X86")
- endif()
- if (_apple_ver EQUAL "15")
- message(STATUS "Found OSX El Capitan Target: Apple, 64 bit,
X86")
- set(APPLE_10_11_X ON CACHE BOOL "Found OSX El Capitan Target:
Apple, 64 bit, X86")
- endif()
- if (_apple_ver EQUAL "14")
- message(STATUS "Found OSX Yosemite Target: Apple, 64 bit, X86")
- set(APPLE_10_10_X ON CACHE BOOL "Found OSX Yosemite Target:
Apple, 64 bit, X86")
- endif()
- if (_apple_ver EQUAL "13")
- message(STATUS "Found OSX Mavericks Target: Apple, 64 bit, X86")
- set(APPLE_10_9_X ON CACHE BOOL "Found OSX Mavericks Target:
Apple, 64 bit, X86")
- endif()
- if (_apple_ver EQUAL "12")
- message(STATUS "Found OSX Mountain Lion Target: Apple, 64 bit,
X86")
- set(APPLE_10_8_X ON CACHE BOOL "Found OSX Mountain Lion Target:
Apple, 64 bit, X86")
- endif()
- if (_apple_ver EQUAL "11")
- message(STATUS "Found OSX Lion Target: Apple, 64 bit, X86")
- set(APPLE_10_7_X ON CACHE BOOL "Found OSX Lion Target: Apple,
64 bit, X86")
- endif()
- if (_apple_ver EQUAL "10")
- message(STATUS "Found OSX Snow Leopard Target: Apple, 64 bit,
X86")
- set(APPLE_10_6_X ON CACHE BOOL "Found OSX Snow Leopard Target:
Apple, 64 bit, X86")
- endif()
- if (_apple_ver EQUAL "9")
- message(STATUS "Found OSX Leopard Target: Apple, 32 bit, X86")
- set(APPLE_10_5_X ON CACHE BOOL "Found OSX Leopard Target:
Apple, 32 bit, X86")
- endif()
- unset(ARCH_X86)
+if (APPLE)
+ if ((CMAKE_SIZEOF_VOID_P EQUAL 8) AND (ARCH_ARM))
+ string(REGEX REPLACE ".*-darwin([0-9]+).*" "\\1" _apple_ver
"${MACHINE}")
+ if (_apple_ver EQUAL "20")
+ message(STATUS "Found macOS Big Sur Target: Apple, 64
bit, ARM")
+ set(APPLE_11_00_X ON CACHE BOOL "Found macOS Big Sur
Target: Apple, 64 bit, ARM")
+ endif()
+ endif()
+ if ((CMAKE_SIZEOF_VOID_P EQUAL 8) AND (ARCH_X86 OR ARCH_X86_64))
+ string(REGEX REPLACE ".*-darwin([0-9]+).*" "\\1" _apple_ver
"${MACHINE}")
+ if (_apple_ver EQUAL "20")
+ message(STATUS "Found macOS Big Sur Target: Apple, 64
bit, X86")
+ set(APPLE_11_00_X ON CACHE BOOL "Found macOS Big Sur
Target: Apple, 64 bit, X86")
+ endif()
+ if (_apple_ver EQUAL "19")
+ message(STATUS "Found macOS Catalina Target: Apple, 64
bit, X86")
+ set(APPLE_10_15_X ON CACHE BOOL "Found macOS Catalina
Target: Apple, 64 bit, X86")
+ endif()
+ if (_apple_ver EQUAL "18")
+ message(STATUS "Found macOS Mojave Target: Apple, 64
bit, X86")
+ set(APPLE_10_14_X ON CACHE BOOL "Found macOS Mojave
Target: Apple, 64 bit, X86")
+ endif()
+ if (_apple_ver EQUAL "17")
+ message(STATUS "Found macOS High Sierra Target: Apple,
64 bit, X86")
+ set(APPLE_10_13_X ON CACHE BOOL "Found macOS High
Sierra Target: Apple, 64 bit, X86")
+ endif()
+ if (_apple_ver EQUAL "16")
+ message(STATUS "Found macOS Sierra Target: Apple, 64
bit, X86")
+ set(APPLE_10_12_X ON CACHE BOOL "Found macOS Sierra
Target: Apple, 64 bit, X86")
+ endif()
+ if (_apple_ver EQUAL "15")
+ message(STATUS "Found OSX El Capitan Target: Apple, 64
bit, X86")
+ set(APPLE_10_11_X ON CACHE BOOL "Found OSX El Capitan
Target: Apple, 64 bit, X86")
+ endif()
+ if (_apple_ver EQUAL "14")
+ message(STATUS "Found OSX Yosemite Target: Apple, 64
bit, X86")
+ set(APPLE_10_10_X ON CACHE BOOL "Found OSX Yosemite
Target: Apple, 64 bit, X86")
+ endif()
+ if (_apple_ver EQUAL "13")
+ message(STATUS "Found OSX Mavericks Target: Apple, 64
bit, X86")
+ set(APPLE_10_9_X ON CACHE BOOL "Found OSX Mavericks
Target: Apple, 64 bit, X86")
+ endif()
+ if (_apple_ver EQUAL "12")
+ message(STATUS "Found OSX Mountain Lion Target: Apple,
64 bit, X86")
+ set(APPLE_10_8_X ON CACHE BOOL "Found OSX Mountain Lion
Target: Apple, 64 bit, X86")
+ endif()
+ if (_apple_ver EQUAL "11")
+ message(STATUS "Found OSX Lion Target: Apple, 64 bit,
X86")
+ set(APPLE_10_7_X ON CACHE BOOL "Found OSX Lion Target:
Apple, 64 bit, X86")
+ endif()
+ if (_apple_ver EQUAL "10")
+ message(STATUS "Found OSX Snow Leopard Target: Apple,
64 bit, X86")
+ set(APPLE_10_6_X ON CACHE BOOL "Found OSX Snow Leopard
Target: Apple, 64 bit, X86")
+ endif()
+ if (_apple_ver EQUAL "9")
+ message(STATUS "Found OSX Leopard Target: Apple, 32
bit, X86")
+ set(APPLE_10_5_X ON CACHE BOOL "Found OSX Leopard
Target: Apple, 32 bit, X86")
+ endif()
+ unset(ARCH_X86)
+ endif()
endif()
Modified: trunk/Scribus/CMakeLists_Apple.cmake
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23908&path=/trunk/Scribus/CMakeLists_Apple.cmake
==============================================================================
--- trunk/Scribus/CMakeLists_Apple.cmake (original)
+++ trunk/Scribus/CMakeLists_Apple.cmake Tue Jun 30 16:47:41 2020
@@ -1,3 +1,17 @@
+if(APPLE_11_00_X)
+ set(OSXMINVER "11.00" CACHE STRING "OSX 11.00")
+ if (WANT_OSX_SDK)
+
if(EXISTS("/Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.16.sdk"))
+ set(CMAKE_OSX_SYSROOT
"/Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.16.sdk")
+
elseif(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.16.sdk"))
+ set(CMAKE_OSX_SYSROOT
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.16.sdk")
+
elseif(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.00.sdk"))
+ set(CMAKE_OSX_SYSROOT
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.00.sdk")
+
elseif(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk"))
+ set(CMAKE_OSX_SYSROOT
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk")
+ endif()
+ endif()
+endif()
if(APPLE_10_15_X)
set(OSXMINVER "10.15" CACHE STRING "OSX 10.15")
if (WANT_OSX_SDK)
@@ -110,7 +124,7 @@
if (WANT_OSX_SDK)
set(CMAKE_OSX_DEPLOYMENT_TARGET "${OSXMINVER}")
endif()
- if(APPLE_10_6_X OR APPLE_10_7_X OR APPLE_10_8_X OR APPLE_10_9_X
OR APPLE_10_10_X OR APPLE_10_11_X OR APPLE_10_12_X OR APPLE_10_13_X OR
APPLE_10_14_X OR APPLE_10_15_X)
+ if(APPLE_10_6_X OR APPLE_10_7_X OR APPLE_10_8_X OR APPLE_10_9_X
OR APPLE_10_10_X OR APPLE_10_11_X OR APPLE_10_12_X OR APPLE_10_13_X OR
APPLE_10_14_X OR APPLE_10_15_X OR APPLE_10_16_X)
message(STATUS "Setting x86_64 Architecture for OSX
Build/Bundle")
set(CMAKE_OSX_ARCHITECTURES "x86_64" )
set(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "x86_64" )
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
