diff options
| author | Charles Giessen <[email protected]> | 2024-07-10 11:08:19 -0500 |
|---|---|---|
| committer | Charles Giessen <[email protected]> | 2024-07-10 11:12:48 -0500 |
| commit | 78a92e2c7c5aa1c7b7e6f9c475bd9009977ea8f9 (patch) | |
| tree | 0cbd31fd84ce01aa3cc765f276331bb210516daa | |
| parent | 6c539b2ed2dba2997cdedeac0b376ff2fe382595 (diff) | |
| download | Vulkan-Headers-78a92e2c7c5aa1c7b7e6f9c475bd9009977ea8f9.tar.gz Vulkan-Headers-78a92e2c7c5aa1c7b7e6f9c475bd9009977ea8f9.zip | |
build: Require MSVC 17.11 for module support
17.10 and before has a bug that prevents the vulkan.cppm module from
compiling. The module support wont be enabled unless the MSVC version
contains the fix.
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a69445d..e6031dc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,7 @@ jobs: with: cmakeVersion: ${{ matrix.cmake-version }} - uses: ilammy/msvc-dev-cmd@v1 - - run: cmake -S . -B build -D VULKAN_HEADERS_ENABLE_TESTS=ON -D VULKAN_HEADERS_ENABLE_INSTALL=ON -G Ninja -DVULKAN_HEADERS_ENABLE_MODULE=OFF # workaround for compiler bug in 17.10 and before + - run: cmake -S . -B build -D VULKAN_HEADERS_ENABLE_TESTS=ON -D VULKAN_HEADERS_ENABLE_INSTALL=ON -G Ninja - run: cmake --build ./build - run: cmake --install build/ --prefix build/install - run: ctest --output-on-failure diff --git a/CMakeLists.txt b/CMakeLists.txt index 8df7850..233bcc0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ add_library(Vulkan-Headers INTERFACE) add_library(Vulkan::Headers ALIAS Vulkan-Headers) target_include_directories(Vulkan-Headers INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>) -if (MSVC AND (MSVC_VERSION GREATER_EQUAL "1934") OR +if (MSVC AND (MSVC_VERSION GREATER_EQUAL "1941") OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "16.0" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "14.0") set(COMPILER_SUPPORTS_CXX_MODULES TRUE) |