diff options
| author | Sharadh Rajaraman <[email protected]> | 2024-06-14 23:53:27 +0100 |
|---|---|---|
| committer | Charles Giessen <[email protected]> | 2024-06-18 14:25:22 -0600 |
| commit | 85256c712ce9ee9755ae74faacc3e6a1d2c5eddf (patch) | |
| tree | 669ff54a407de33c5999b180ff1825f4c9a70236 /CMakeLists.txt | |
| parent | 8f034f6b48fd2d30f711396a021e1dc050c8941c (diff) | |
| download | Vulkan-Headers-85256c712ce9ee9755ae74faacc3e6a1d2c5eddf.tar.gz Vulkan-Headers-85256c712ce9ee9755ae74faacc3e6a1d2c5eddf.zip | |
Add `vulkan.cppm` as a separate library: `Vulkan::VulkanHppModule`
- Guarded behind `if()` version and compiler test
- Linked to `Vulkan-Headers` as a dependency
- Also added `CXX` to the `LANGUAGES` property of the project
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 35 |
1 files changed, 32 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 698666f..2a5db4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ # # SPDX-License-Identifier: Apache-2.0 # ~~~ -cmake_minimum_required(VERSION 3.15...3.25) +cmake_minimum_required(VERSION 3.15) # NOTE: Parsing the version like this is suboptimal but neccessary due to our release process: # https://github.com/KhronosGroup/Vulkan-Headers/pull/346 @@ -36,12 +36,33 @@ function(vlk_get_header_version) endfunction() vlk_get_header_version() -project(VULKAN_HEADERS LANGUAGES C VERSION ${VK_VERSION_STRING}) +project(VULKAN_HEADERS LANGUAGES C CXX VERSION ${VK_VERSION_STRING}) 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 + 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) +endif() + + +if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.28" AND COMPILER_SUPPORTS_CXX_MODULES) + add_library(Vulkan-Module) + add_library(Vulkan::VulkanHppModule ALIAS Vulkan-Module) + target_sources(Vulkan-Module + PUBLIC + FILE_SET module + TYPE CXX_MODULES + BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include" + FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/vulkan/vulkan.cppm" + ) + target_compile_features(Vulkan-Module PUBLIC cxx_std_20) + target_link_libraries(Vulkan-Module PUBLIC Vulkan-Headers) +endif () + if (CMAKE_VERSION VERSION_LESS "3.21") # https://cmake.org/cmake/help/latest/variable/PROJECT_IS_TOP_LEVEL.html string(COMPARE EQUAL ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} PROJECT_IS_TOP_LEVEL) @@ -65,8 +86,16 @@ if (VULKAN_HEADERS_ENABLE_INSTALL) install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/registry" DESTINATION "${CMAKE_INSTALL_DATADIR}/vulkan" USE_SOURCE_PERMISSIONS) set_target_properties(Vulkan-Headers PROPERTIES EXPORT_NAME "Headers") - install(TARGETS Vulkan-Headers EXPORT VulkanHeadersConfig INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + + if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.28" AND COMPILER_SUPPORTS_CXX_MODULES) + install(TARGETS Vulkan-Module + EXPORT VulkanHeadersConfig + FILE_SET module + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/include/vulkan" + ) + endif() + install(EXPORT VulkanHeadersConfig NAMESPACE "Vulkan::" DESTINATION "share/cmake/VulkanHeaders") set(version_config "${CMAKE_CURRENT_BINARY_DIR}/generated/VulkanHeadersConfigVersion.cmake") |