From c8617c26c5c109ea79e9c5cc3cd2feca3e7b8338 Mon Sep 17 00:00:00 2001 From: u3dreal <48415446+u3dreal@users.noreply.github.com> Date: Sun, 26 Jan 2020 12:59:56 +0100 Subject: [PATCH 1/7] Update azure-pipelines.yml changing to macOS 10.14 since azure drops support --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9f42b413f..97a14a4ec 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -161,7 +161,7 @@ jobs: condition: succeeded() timeoutInMinutes: 0 pool: - vmImage: 'macOS-10.13' + vmImage: 'macOS-10.14' variables: version_string: $[ dependencies.DetectBuildType.outputs['setvarStep.version_string'] ] From 43de679919ce7c262d91986821fd4bda57f0f475 Mon Sep 17 00:00:00 2001 From: u3dreal <48415446+u3dreal@users.noreply.github.com> Date: Sun, 26 Jan 2020 13:10:53 +0100 Subject: [PATCH 2/7] Update PlatformSpecific.cmake changes for macos 10.14 --- cmake/PlatformSpecific.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake/PlatformSpecific.cmake b/cmake/PlatformSpecific.cmake index b13ccae91..7216bcd94 100644 --- a/cmake/PlatformSpecific.cmake +++ b/cmake/PlatformSpecific.cmake @@ -159,8 +159,10 @@ IF(APPLE) EXECUTE_PROCESS(COMMAND uname -r OUTPUT_VARIABLE MAC_SYS) # check for actual system-version SET(CMAKE_OSX_DEPLOYMENT_TARGET 10.13) # Minimum OS requirements for LuxCore - - IF(${MAC_SYS} MATCHES 17) + + IF(${MAC_SYS} MATCHES 18) + SET(OSX_SYSTEM 10.14) + ELSEIF(${MAC_SYS} MATCHES 17) SET(OSX_SYSTEM 10.14) ELSEIF(${MAC_SYS} MATCHES 16) SET(OSX_SYSTEM 10.12) From fe28604db1b42e012bd24628b77db0eff5043beb Mon Sep 17 00:00:00 2001 From: u3dreal <48415446+u3dreal@users.noreply.github.com> Date: Sun, 26 Jan 2020 13:28:17 +0100 Subject: [PATCH 3/7] Update PlatformSpecific.cmake --- cmake/PlatformSpecific.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/PlatformSpecific.cmake b/cmake/PlatformSpecific.cmake index 7216bcd94..39e10d662 100644 --- a/cmake/PlatformSpecific.cmake +++ b/cmake/PlatformSpecific.cmake @@ -161,7 +161,7 @@ IF(APPLE) SET(CMAKE_OSX_DEPLOYMENT_TARGET 10.13) # Minimum OS requirements for LuxCore IF(${MAC_SYS} MATCHES 18) - SET(OSX_SYSTEM 10.14) + SET(OSX_SYSTEM 10.15) ELSEIF(${MAC_SYS} MATCHES 17) SET(OSX_SYSTEM 10.14) ELSEIF(${MAC_SYS} MATCHES 16) From c7d11efbef729d358745e0327c05bd31d4c5c082 Mon Sep 17 00:00:00 2001 From: u3dreal <48415446+u3dreal@users.noreply.github.com> Date: Sun, 26 Jan 2020 13:41:30 +0100 Subject: [PATCH 4/7] using xcode 10.1 --- cmake/PlatformSpecific.cmake | 2 +- scripts/azurepipeline/macos/install.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/PlatformSpecific.cmake b/cmake/PlatformSpecific.cmake index 39e10d662..7216bcd94 100644 --- a/cmake/PlatformSpecific.cmake +++ b/cmake/PlatformSpecific.cmake @@ -161,7 +161,7 @@ IF(APPLE) SET(CMAKE_OSX_DEPLOYMENT_TARGET 10.13) # Minimum OS requirements for LuxCore IF(${MAC_SYS} MATCHES 18) - SET(OSX_SYSTEM 10.15) + SET(OSX_SYSTEM 10.14) ELSEIF(${MAC_SYS} MATCHES 17) SET(OSX_SYSTEM 10.14) ELSEIF(${MAC_SYS} MATCHES 16) diff --git a/scripts/azurepipeline/macos/install.sh b/scripts/azurepipeline/macos/install.sh index 9b212ce38..deeb23d18 100755 --- a/scripts/azurepipeline/macos/install.sh +++ b/scripts/azurepipeline/macos/install.sh @@ -1,5 +1,7 @@ #!/bin/bash +#switch to XCode 10.1 +xcode-select -s /Applications/Xcode_10.1.app #Install Build Tools brew install bison brew install pyenv From b1abb08e7476bb5ff022c71e289ab6894c6bb076 Mon Sep 17 00:00:00 2001 From: u3dreal <48415446+u3dreal@users.noreply.github.com> Date: Sun, 26 Jan 2020 13:43:36 +0100 Subject: [PATCH 5/7] Update install.sh --- scripts/azurepipeline/macos/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azurepipeline/macos/install.sh b/scripts/azurepipeline/macos/install.sh index deeb23d18..992745193 100755 --- a/scripts/azurepipeline/macos/install.sh +++ b/scripts/azurepipeline/macos/install.sh @@ -1,7 +1,7 @@ #!/bin/bash #switch to XCode 10.1 -xcode-select -s /Applications/Xcode_10.1.app +sudo xcode-select -s /Applications/Xcode_10.1.app #Install Build Tools brew install bison brew install pyenv From 75f46bbfb712765d626c7ef2a415e45ec5d987dc Mon Sep 17 00:00:00 2001 From: u3dreal <48415446+u3dreal@users.noreply.github.com> Date: Sun, 26 Jan 2020 13:51:37 +0100 Subject: [PATCH 6/7] Update PlatformSpecific.cmake --- cmake/PlatformSpecific.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/PlatformSpecific.cmake b/cmake/PlatformSpecific.cmake index 7216bcd94..c420985b2 100644 --- a/cmake/PlatformSpecific.cmake +++ b/cmake/PlatformSpecific.cmake @@ -179,7 +179,7 @@ IF(APPLE) SET(CMAKE_XCODE_ATTRIBUTE_ARCHS $(NATIVE_ARCH_ACTUAL)) - SET(CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) + SET(CMAKE_OSX_SYSROOT /Applications/Xcode_10.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) SET(CMAKE_XCODE_ATTRIBUTE_SDKROOT macosx) # to silence sdk not found warning, just overrides CMAKE_OSX_SYSROOT, gets latest available # set a precedence of sdk path over all other default search pathes From 3010167417ab70536e6a58f4ea6e71e30248f9e6 Mon Sep 17 00:00:00 2001 From: u3dreal <48415446+u3dreal@users.noreply.github.com> Date: Sun, 26 Jan 2020 14:53:15 +0100 Subject: [PATCH 7/7] Update PlatformSpecific.cmake --- cmake/PlatformSpecific.cmake | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/cmake/PlatformSpecific.cmake b/cmake/PlatformSpecific.cmake index c420985b2..da14d5bfa 100644 --- a/cmake/PlatformSpecific.cmake +++ b/cmake/PlatformSpecific.cmake @@ -152,6 +152,7 @@ ENDIF(MSVC) ########################################################################### IF(APPLE) + CMAKE_MINIMUM_REQUIRED(VERSION 3.12) # Required for FindBoost 1.67.0 ########## OS and hardware detection ########### @@ -165,7 +166,7 @@ IF(APPLE) ELSEIF(${MAC_SYS} MATCHES 17) SET(OSX_SYSTEM 10.14) ELSEIF(${MAC_SYS} MATCHES 16) - SET(OSX_SYSTEM 10.12) + SET(OSX_SYSTEM 10.13) ELSE() SET(OSX_SYSTEM unsupported) ENDIF() @@ -178,9 +179,17 @@ IF(APPLE) ENDIF() SET(CMAKE_XCODE_ATTRIBUTE_ARCHS $(NATIVE_ARCH_ACTUAL)) - - SET(CMAKE_OSX_SYSROOT /Applications/Xcode_10.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) - SET(CMAKE_XCODE_ATTRIBUTE_SDKROOT macosx) # to silence sdk not found warning, just overrides CMAKE_OSX_SYSROOT, gets latest available + + + SET(AZURE 1) # Set 0 when compiled locally and not on azure + + IF(AZURE) + SET(CMAKE_OSX_SYSROOT /Applications/Xcode_10.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) + ELSE() + SET(CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) + ENDIF() + + SET(CMAKE_XCODE_ATTRIBUTE_SDKROOT macosx) # to silence sdk not found warning, just overrides CMAKE_OSX_SYSROOT, gets latest available # set a precedence of sdk path over all other default search pathes SET(CMAKE_FIND_ROOT_PATH ${CMAKE_OSX_SYSROOT})