Skip to content

Commit f5fad0a

Browse files
Revert "CMake: Don't install C++ module headers if module build is disabled"
This reverts commit 37057b4.
1 parent 4eebce1 commit f5fad0a

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

CMakeLists.txt

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,18 +113,11 @@ if (VULKAN_HEADERS_ENABLE_INSTALL)
113113
include(GNUInstallDirs)
114114
include(CMakePackageConfigHelpers)
115115

116-
if(VULKAN_HEADERS_ENABLE_MODULE)
117-
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/vk_video" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
118-
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/vulkan" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
119-
# Preserve source permissions https://github.com/KhronosGroup/Vulkan-Headers/issues/336
120-
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/registry" DESTINATION "${CMAKE_INSTALL_DATADIR}/vulkan" USE_SOURCE_PERMISSIONS)
121-
else()
122-
# Don't install C++ module files if modules aren't enabled
123-
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/vk_video" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} PATTERN "*.cppm" EXCLUDE)
124-
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/vulkan" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} PATTERN "*.cppm" EXCLUDE)
125-
# Preserve source permissions https://github.com/KhronosGroup/Vulkan-Headers/issues/336
126-
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/registry" DESTINATION "${CMAKE_INSTALL_DATADIR}/vulkan" USE_SOURCE_PERMISSIONS PATTERN "*.cppm" EXCLUDE)
127-
endif()
116+
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/vk_video" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
117+
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/vulkan" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
118+
# Preserve source permissions https://github.com/KhronosGroup/Vulkan-Headers/issues/336
119+
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/registry" DESTINATION "${CMAKE_INSTALL_DATADIR}/vulkan" USE_SOURCE_PERMISSIONS)
120+
128121

129122
set_target_properties(Vulkan-Headers PROPERTIES EXPORT_NAME "Headers")
130123
install(TARGETS Vulkan-Headers

0 commit comments

Comments
 (0)