diff options
| author | Juan Ramos <juan@lunarg.com> | 2022-10-21 10:36:55 -0600 |
|---|---|---|
| committer | Juan Ramos <114601453+juan-lunarg@users.noreply.github.com> | 2022-10-24 11:44:00 -0600 |
| commit | 616c407893a935101d2e3ba0812dcacc2b3e303f (patch) | |
| tree | ba1308bc5a716795b057dbe39558694969717b49 | |
| parent | 0a3b52945c40ecac86c09139b35e753912e5dbcf (diff) | |
| download | vulkan-tools-616c407893a935101d2e3ba0812dcacc2b3e303f.tar.gz | |
ci: Use MACOS_DEPLOYMENT_TARGET
- This approach matches what our SDK release process expect
- Since setting CMAKE_MACOS_DEPLOYMENT_TARGET ignores env variable which SDK
release process uses, which could will cause issues in the future, if
the version is changed
- CMAKE_MACOS_DEPLOYMENT_TARGET doesn't propogate to dependencies via
update_deps.py
| -rw-r--r-- | .github/workflows/build.yml | 4 | ||||
| -rw-r--r-- | BUILD.md | 5 | ||||
| -rw-r--r-- | CMakeLists.txt | 11 |
3 files changed, 8 insertions, 12 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a7a38728..af8e6364 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -111,6 +111,10 @@ jobs: - name: Generate build files run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=${{matrix.config}} -Cexternal/helper.cmake + env: + # Specify the minimum version of macOS on which the target binaries are to be deployed. + # https://cmake.org/cmake/help/latest/envvar/MACOSX_DEPLOYMENT_TARGET.html + MACOSX_DEPLOYMENT_TARGET: 10.12 - name: Build the tools run: make -C build @@ -212,7 +212,6 @@ The following is a table of all string options currently supported by this repos | Option | Platform | Default | Description | | ------ | -------- | ------- | ----------- | -| CMAKE_OSX_DEPLOYMENT_TARGET | MacOS | `10.12` | The minimum version of MacOS for loader deployment. | | VULKANINFO_BUILD_DLL_VERSIONINFO | Windows | `""` | Set the Windows specific version information for Vulkaninfo. Format is "major.minor.patch.build". | These variables should be set using the `-D` option when invoking CMake to @@ -635,9 +634,9 @@ Use the following command to run vkcube for Android: ### MacOS Build Requirements -Tested on OSX version 10.12.6 +Tested on OSX version 10.12 -- [CMake 3.10.2](https://cmake.org/files/v3.10/cmake-3.10.2-Darwin-x86_64.tar.gz) is recommended. +NOTE: To force the OSX version set the environment variable [MACOSX_DEPLOYMENT_TARGET](https://cmake.org/cmake/help/latest/envvar/MACOSX_DEPLOYMENT_TARGET.html) when building VVL and it's dependencies. Setup Homebrew and components diff --git a/CMakeLists.txt b/CMakeLists.txt index 422b7d2c..45d9d45b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ # ~~~ -# Copyright (c) 2014-2018 Valve Corporation -# Copyright (c) 2014-2018 LunarG, Inc. +# Copyright (c) 2014-2022 Valve Corporation +# Copyright (c) 2014-2022 LunarG, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,15 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # ~~~ - -# CMake project initialization --------------------------------------------------------------------------------------------------- -# This section contains pre-project() initialization, and ends with the project() command. - cmake_minimum_required(VERSION 3.10.2) -# Apple: Must be set before enable_language() or project() as it may influence configuration of the toolchain and flags. -set(CMAKE_OSX_DEPLOYMENT_TARGET "10.12" CACHE STRING "Minimum OS X deployment version") - project(Vulkan-Tools) # find_package(), include() and global project settings -------------------------------------------------------------------------- |