mirror of
https://github.com/KhronosGroup/Vulkan-Headers
synced 2024-11-21 06:26:00 -07:00
build: Disable Vulkan-Module by default
Some checks failed
ci / cmake-unix (3.15, macos-latest) (push) Has been cancelled
ci / cmake-unix (3.15, ubuntu-latest) (push) Has been cancelled
ci / cmake-unix (latest, macos-latest) (push) Has been cancelled
ci / cmake-unix (latest, ubuntu-latest) (push) Has been cancelled
ci / cmake-windows (3.15) (push) Has been cancelled
ci / cmake-windows (latest) (push) Has been cancelled
ci / windows_clang (clang) (push) Has been cancelled
ci / windows_clang (clang-cl) (push) Has been cancelled
ci / reuse (push) Has been cancelled
Some checks failed
ci / cmake-unix (3.15, macos-latest) (push) Has been cancelled
ci / cmake-unix (3.15, ubuntu-latest) (push) Has been cancelled
ci / cmake-unix (latest, macos-latest) (push) Has been cancelled
ci / cmake-unix (latest, ubuntu-latest) (push) Has been cancelled
ci / cmake-windows (3.15) (push) Has been cancelled
ci / cmake-windows (latest) (push) Has been cancelled
ci / windows_clang (clang) (push) Has been cancelled
ci / windows_clang (clang-cl) (push) Has been cancelled
ci / reuse (push) Has been cancelled
After numerous reports of builds being broken due to the addition of the Vulkan-Module support code in CMake, the option is being set to OFF by default. This prevents projects which do not use the module from not being able to build due to compiler, build system, and platform issues. Projects wishing to enable modules can set the cmake option VULKAN_HEADERS_ENABLE_MODULE=ON to re-enable the module support. Add a warning in case a user decides to enable the module but the platform doesn't support modules.
This commit is contained in:
parent
ab1ea9059d
commit
f2eb740f3f
1 changed files with 6 additions and 2 deletions
|
@ -52,9 +52,13 @@ if ((CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND (MSVC_VERSION GREATER_EQUAL "1941
|
||||||
set(COMPILER_SUPPORTS_CXX_MODULES TRUE)
|
set(COMPILER_SUPPORTS_CXX_MODULES TRUE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
option(VULKAN_HEADERS_ENABLE_MODULE "Enables building of the Vulkan C++ module. Default is true if supported by the CMake version and compilers" ${COMPILER_SUPPORTS_CXX_MODULES})
|
option(VULKAN_HEADERS_ENABLE_MODULE "Enables building of the Vulkan C++ module" OFF)
|
||||||
|
|
||||||
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.28" AND VULKAN_HEADERS_ENABLE_MODULE)
|
if (VULKAN_HEADERS_ENABLE_MODULE AND (NOT COMPILER_SUPPORTS_CXX_MODULES OR CMAKE_VERSION VERSION_LESS "3.28"))
|
||||||
|
message(WARNING "Vulkan C++ module support is requested but was disabled due to lacking support on this platform")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.28" AND VULKAN_HEADERS_ENABLE_MODULE AND COMPILER_SUPPORTS_CXX_MODULES)
|
||||||
add_library(Vulkan-Module)
|
add_library(Vulkan-Module)
|
||||||
add_library(Vulkan::VulkanHppModule ALIAS Vulkan-Module)
|
add_library(Vulkan::VulkanHppModule ALIAS Vulkan-Module)
|
||||||
target_sources(Vulkan-Module
|
target_sources(Vulkan-Module
|
||||||
|
|
Loading…
Reference in a new issue