Skip to content

Commit

Permalink
build: Default to VULKANSC=ON
Browse files Browse the repository at this point in the history
  • Loading branch information
aqnuep committed Apr 3, 2024
1 parent be40e89 commit 9e424e8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit 9e424e8

Please sign in to comment.