From af93ff33487b7852b2eae5467019b6c62b4ff563 Mon Sep 17 00:00:00 2001 From: asuessenbach Date: Mon, 19 Jun 2023 11:36:56 +0200 Subject: [PATCH] Fix defines in workflow files to enable compilation of tests and samples in CI. --- .github/workflows/ci-macos.yml | 12 ++++++------ .github/workflows/ci-ubuntu.yml | 12 ++++++------ .github/workflows/ci-windows.yml | 12 ++++++------ snippets/defines.hpp | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index 5a3074702..8f8160e96 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -33,12 +33,12 @@ jobs: - name: Configure CMake run: cmake -B ${{github.workspace}}/build -GNinja - -DSAMPLES_BUILD=ON - -DSAMPLES_BUILD_ONLY_DYNAMIC=ON - -DSAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP=ON - -DTESTS_BUILD=ON - -DTESTS_BUILD_ONLY_DYNAMIC=ON - -DTESTS_BUILD_WITH_LOCAL_VULKAN_HPP=ON + -DVULKAN_HPP_SAMPLES_BUILD=ON + -DVULKAN_HPP_SAMPLES_BUILD_ONLY_DYNAMIC=ON + -DVULKAN_HPP_SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP=ON + -DVULKAN_HPP_TESTS_BUILD=ON + -DVULKAN_HPP_TESTS_BUILD_ONLY_DYNAMIC=ON + -DVULKAN_HPP_TESTS_BUILD_WITH_LOCAL_VULKAN_HPP=ON -DVULKAN_HPP_RUN_GENERATOR=ON -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}} -DCMAKE_C_COMPILER=${{matrix.compiler.c}} diff --git a/.github/workflows/ci-ubuntu.yml b/.github/workflows/ci-ubuntu.yml index a2a91d61b..c7f269551 100644 --- a/.github/workflows/ci-ubuntu.yml +++ b/.github/workflows/ci-ubuntu.yml @@ -36,12 +36,12 @@ jobs: - name: Configure CMake run: cmake -B ${{github.workspace}}/build -GNinja - -DSAMPLES_BUILD=ON - -DSAMPLES_BUILD_ONLY_DYNAMIC=ON - -DSAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP=ON - -DTESTS_BUILD=ON - -DTESTS_BUILD_ONLY_DYNAMIC=ON - -DTESTS_BUILD_WITH_LOCAL_VULKAN_HPP=ON + -DVULKAN_HPP_SAMPLES_BUILD=ON + -DVULKAN_HPP_SAMPLES_BUILD_ONLY_DYNAMIC=ON + -DVULKAN_HPP_SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP=ON + -DVULKAN_HPP_TESTS_BUILD=ON + -DVULKAN_HPP_TESTS_BUILD_ONLY_DYNAMIC=ON + -DVULKAN_HPP_TESTS_BUILD_WITH_LOCAL_VULKAN_HPP=ON -DVULKAN_HPP_RUN_GENERATOR=ON -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}} -DCMAKE_C_COMPILER=${{matrix.compiler.c}} diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index 7cff6f356..eb746aa0a 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -27,12 +27,12 @@ jobs: - name: Configure CMake run: cmake -B ${{github.workspace}}/build - -DSAMPLES_BUILD=ON - -DSAMPLES_BUILD_ONLY_DYNAMIC=ON - -DSAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP=ON - -DTESTS_BUILD=ON - -DTESTS_BUILD_ONLY_DYNAMIC=ON - -DTESTS_BUILD_WITH_LOCAL_VULKAN_HPP=ON + -DVULKAN_HPP_SAMPLES_BUILD=ON + -DVULKAN_HPP_SAMPLES_BUILD_ONLY_DYNAMIC=ON + -DVULKAN_HPP_SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP=ON + -DVULKAN_HPP_TESTS_BUILD=ON + -DVULKAN_HPP_TESTS_BUILD_ONLY_DYNAMIC=ON + -DVULKAN_HPP_TESTS_BUILD_WITH_LOCAL_VULKAN_HPP=ON -DVULKAN_HPP_PRECOMPILE=OFF -DVULKAN_HPP_RUN_GENERATOR=ON -DCMAKE_CXX_STANDARD=${{matrix.cxx_standard}} diff --git a/snippets/defines.hpp b/snippets/defines.hpp index 899812f25..276272d0b 100644 --- a/snippets/defines.hpp +++ b/snippets/defines.hpp @@ -63,7 +63,7 @@ # else # define VULKAN_HPP_CONSTEXPR_14 # endif -# if ( 201907 <= __cpp_constexpr ) && ( !defined(__GNUC__) || ( 110300 < GCC_VERSION ) ) +# if ( 201907 <= __cpp_constexpr ) && ( !defined(__GNUC__) || ( 110400 < GCC_VERSION ) ) # define VULKAN_HPP_CONSTEXPR_20 constexpr # else # define VULKAN_HPP_CONSTEXPR_20