From 9e424e86fbbcf7768b8ecc3045fa3261c09f3fc3 Mon Sep 17 00:00:00 2001 From: Daniel Rakos Date: Wed, 3 Apr 2024 10:51:31 +0200 Subject: [PATCH] build: Default to VULKANSC=ON --- .github/workflows/ci.yml | 4 ++-- BUILD.md | 6 +++--- CMakeLists.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 644583c..1415448 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: with: cmakeVersion: ${{ matrix.cmake-version }} - uses: ilammy/msvc-dev-cmd@v1 - - run: cmake -S . -B build -D BUILD_TESTS=ON -G Ninja -DVULKANSC=ON + - run: cmake -S . -B build -D BUILD_TESTS=ON -G Ninja - run: cmake --build build - run: cmake --install build --prefix ${GITHUB_WORKSPACE}/build/install - run: ctest --output-on-failure @@ -52,7 +52,7 @@ jobs: with: python-version: '3.8' - uses: ilammy/msvc-dev-cmd@v1 - - run: cmake -S . -B build -D BUILD_TESTS=ON -G Ninja -DVULKANSC=ON -DGEN_VULKANSC_COMBINED=ON + - run: cmake -S . -B build -D BUILD_TESTS=ON -G Ninja -DGEN_VULKANSC_COMBINED=ON - run: cmake --build build - run: cmake --install build --prefix ${GITHUB_WORKSPACE}/build/install - run: ctest --output-on-failure diff --git a/BUILD.md b/BUILD.md index 7df2f14..9ffc4e8 100644 --- a/BUILD.md +++ b/BUILD.md @@ -9,13 +9,13 @@ SPDX-License-Identifier: Apache-2.0 Build the Vulkan SC headers from this repository as follows: ```bash -cmake -DVULKANSC=ON -S . -B build/ +cmake -S . -B build/ cmake --install build --prefix build/install ``` Build the combined Vulkan SC headers used by ecosystem components as follows: ```bash -cmake -DVULKANSC=ON -DGEN_VULKANSC_COMBINED -S . -B build/ +cmake -DGEN_VULKANSC_COMBINED -S . -B build/ cmake --build build cmake --install build --prefix build/install ``` @@ -31,7 +31,7 @@ git clone https://github.com/KhronosGroup/VulkanSC-Headers.git cd VulkanSC-Headers/ # Configure the project -cmake -S . -B build/ -DVULKANSC=ON +cmake -S . -B build/ # Because Vulkan-Headers is header only we don't need to build anything. # Users can install it where they need to. diff --git a/CMakeLists.txt b/CMakeLists.txt index f525923..e753110 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.15...3.25) # Add support for VULKANSC mode from the command line -set(VULKANSC OFF CACHE BOOL "User defined variable for VULKANSC mode to be passed in through cmake command line e.g. -DVULKANSC=ON") +set(VULKANSC ON CACHE BOOL "User defined variable for VULKANSC mode to be passed in through cmake command line e.g. -DVULKANSC=ON") # Generate combined Vulkan + Vulkan SC headers set(GEN_VULKANSC_COMBINED OFF CACHE BOOL "Generate combined headers")