Merge fcc8e510a1 into 5ceb9ed481

.github/workflows/ci.yml

@@ -28,7 +28,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
+      - run: cmake -S . -B build -D VULKAN_HEADERS_ENABLE_TESTS=ON -D VULKAN_HEADERS_ENABLE_INSTALL=ON
       - run: cmake --build ./build
       - run: cmake --install build/ --prefix build/install
       - run: ctest --output-on-failure
@@ -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
+      - run: cmake -S . -B build -D VULKAN_HEADERS_ENABLE_TESTS=ON -D VULKAN_HEADERS_ENABLE_INSTALL=ON
       - run: cmake --build ./build
       - run: cmake --install build/ --prefix build/install
       - run: ctest --output-on-failure
@@ -68,7 +68,6 @@ jobs:
             -D CMAKE_BUILD_TYPE=Release `
             -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
@@ -95,7 +94,6 @@ jobs:
           -D VULKAN_HEADERS_ENABLE_MODULE=ON \
           -D VULKAN_HEADERS_ENABLE_MODULE_STD=OFF \
           -D CMAKE_CXX_COMPILER=${{ matrix.compiler }} \
-          -G Ninja
       - run: cmake --build ./build
       - run: cmake --install build/ --prefix build/install
       - run: CXX=${{ matrix.compiler }} ctest --output-on-failure
@@ -120,7 +118,6 @@ jobs:
           -D VULKAN_HEADERS_ENABLE_INSTALL=ON `
           -D VULKAN_HEADERS_ENABLE_MODULE=ON `
           -D VULKAN_HEADERS_ENABLE_MODULE_STD=OFF `
-          -G Ninja
       - run: cmake --build ./build
       - run: cmake --install build/ --prefix build/install
       - run: ctest --output-on-failure

CMakeLists.txt

@@ -115,9 +115,26 @@ 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})
-
-    install(EXPORT VulkanHeadersConfig NAMESPACE "Vulkan::" DESTINATION "share/cmake/VulkanHeaders")
+    if (VULKAN_HEADERS_ENABLE_MODULE)
+        # install Vulkan-Hpp module alongside headers
+        set_target_properties(Vulkan-HppModule PROPERTIES EXPORT_NAME "HppModule")
+        install(TARGETS Vulkan-Headers Vulkan-HppModule
+            EXPORT VulkanHeadersConfig
+            FILE_SET module DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+            INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+        install(EXPORT VulkanHeadersConfig
+            NAMESPACE "Vulkan::" 
+            DESTINATION "share/cmake/VulkanHeaders"
+            CXX_MODULES_DIRECTORY .)
+    else()
+        # only install vulkan headers
+        install(TARGETS Vulkan-Headers
+            EXPORT VulkanHeadersConfig
+            INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+        install(EXPORT VulkanHeadersConfig
+            NAMESPACE "Vulkan::" 
+            DESTINATION "share/cmake/VulkanHeaders")
+    endif()
 
     set(version_config "${CMAKE_CURRENT_BINARY_DIR}/generated/VulkanHeadersConfigVersion.cmake")
     write_basic_package_version_file("${version_config}" COMPATIBILITY SameMajorVersion ARCH_INDEPENDENT)

tests/CMakeLists.txt

@@ -26,7 +26,7 @@ add_test(NAME integration.find_package
         --build-and-test ${CMAKE_CURRENT_LIST_DIR}/integration
                          ${CMAKE_CURRENT_BINARY_DIR}/find_package
         --build-generator ${CMAKE_GENERATOR}
-        --build-options -DFIND_PACKAGE_TESTING=ON -DCMAKE_PREFIX_PATH=${test_install_dir}
+        --build-options -DFIND_PACKAGE_TESTING=ON -DCMAKE_PREFIX_PATH=${test_install_dir} -DVULKAN_HEADERS_ENABLE_MODULE=${VULKAN_HEADERS_ENABLE_MODULE}
 )
 
 # Installing comes before testing

tests/integration/CMakeLists.txt

@@ -27,9 +27,7 @@ if (FIND_PACKAGE_TESTING)
         message(FATAL_ERROR "VulkanHeaders_VERSION not defined!")
     endif()
     message(STATUS "VulkanHeaders_VERSION = ${VulkanHeaders_VERSION}")
-endif()
-
-if (NOT FIND_PACKAGE_TESTING)
+else()
     # Consuming vulkan-headers via add_subdirectory should NOT add installation code to the parent CMake project.
     if (DEFINED CMAKE_INSTALL_INCLUDEDIR)
         message(FATAL_ERROR "CMAKE_INSTALL_INCLUDEDIR was defined!")

tests/vk_hpp.cpp

@@ -7,7 +7,7 @@
  */
 #include <vulkan/vulkan.hpp>
 
-int header_version()
+int test_version()
 {
-    return VK_HEADER_VERSION;
+    return static_cast<int>(vk::makeApiVersion(1, 0, 0, 0));
 }