VULKAN_HPP_ENABLE_STD_MODULE is determined by the definition of __cpp…

…_lib_modules, therefore it shouldn't be declared by vku. Also, for consistent behavior, make vku also defines VKU_USE_STD_MODULE when it is unset and __cpp_lib_modules is defined. In order to do this, the header file is included.
stripe2933 · Sep 29, 2024 · 71a68c4 · 71a68c4
1 parent 0672581
commit 71a68c4
Show file tree

Hide file tree

Showing 34 changed files with 83 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -43,6 +43,10 @@ endif()
 # ----------------
 
 add_library(vku)
+target_include_directories(vku PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}>
+)
 target_sources(vku PUBLIC
     FILE_SET CXX_MODULES
     BASE_DIRS ${Vulkan_INCLUDE_DIRS} .
@@ -92,13 +96,17 @@ target_link_libraries(vku PUBLIC
     $<$<BOOL:${VKU_USE_SHADERC}>:Vulkan::shaderc_combined>
 )
 target_compile_definitions(vku PUBLIC
-    $<$<BOOL:${VKU_USE_STD_MODULE}>:VKU_USE_STD_MODULE VULKAN_HPP_ENABLE_STD_MODULE>
+    $<$<BOOL:${VKU_USE_STD_MODULE}>:VKU_USE_STD_MODULE>
     $<$<BOOL:${VKU_USE_SHADERC}>:VKU_USE_SHADERC>
     $<$<BOOL:${MSVC}>:VULKAN_HPP_NO_SMART_HANDLE VK_NO_PROTOTYPES> # See https://github.com/KhronosGroup/Vulkan-Hpp/blob/main/README.md#c20-named-module for the details.
     $<$<PLATFORM_ID:Darwin>:VK_ENABLE_BETA_EXTENSIONS> # For VK_KHR_portability_subset availability.
     $<$<BOOL:${VKU_DEFAULT_DYNAMIC_DISPATCHER}>:VULKAN_HPP_DISPATCH_LOADER_DYNAMIC=1 VMA_STATIC_VULKAN_FUNCTIONS=0 VMA_DYNAMIC_VULKAN_FUNCTIONS=1>
 )
 
+set_target_properties(vku PROPERTIES
+    PUBLIC_HEADER include/macros.hpp
+)
+
 # For usage consistency with FetchContent and find_package.
 add_library(${PROJECT_NAME}::vku ALIAS vku)
 
@@ -119,6 +127,7 @@ include(GNUInstallDirs)
 install(
     TARGETS vku
     EXPORT "${PROJECT_NAME}Targets"
+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
     FILE_SET CXX_MODULES DESTINATION module/${PROJECT_NAME}
 )
 install(

diff --git a/include/macros.hpp b/include/macros.hpp
@@ -0,0 +1,9 @@
+#pragma once
+
+#include <version>
+
+// If VKU_USE_STD_MODULE is not defined and standard library module is available, define it to enable the standard
+// library module usage.
+#if !defined(VKU_USE_STD_MODULE) && defined(__cpp_lib_modules)
+#define VKU_USE_STD_MODULE
+#endif
diff --git a/interface/Gpu.cppm b/interface/Gpu.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #include <version>
 #ifndef VKU_USE_STD_MODULE
 #include <cstdint>

diff --git a/interface/buffers/AllocatedBuffer.cppm b/interface/buffers/AllocatedBuffer.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #ifndef VKU_USE_STD_MODULE
 #include <tuple>
 #include <utility>

diff --git a/interface/buffers/Buffer.cppm b/interface/buffers/Buffer.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #if !defined(VKU_USE_STD_MODULE) && defined(_MSC_VER)
 #include <compare>
 #endif

diff --git a/interface/buffers/MappedBuffer.cppm b/interface/buffers/MappedBuffer.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #include <cassert>
 #ifndef VKU_USE_STD_MODULE
 #include <cstdint>

diff --git a/interface/buffers/mod.cppm b/interface/buffers/mod.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #if !defined(VKU_USE_STD_MODULE) && defined(_MSC_VER)
 #include <compare>
 #endif

diff --git a/interface/commands.cppm b/interface/commands.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #include <version>
 #ifndef VKU_USE_STD_MODULE
 #include <cstdint>

diff --git a/interface/constants.cppm b/interface/constants.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #if !defined(VKU_USE_STD_MODULE) && defined(_MSC_VER)
 #include <compare>
 #endif

diff --git a/interface/debugging.cppm b/interface/debugging.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #ifndef VKU_USE_STD_MODULE
 #include <source_location>
 #endif

diff --git a/interface/descriptors/DescriptorSet.cppm b/interface/descriptors/DescriptorSet.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #ifndef VKU_USE_STD_MODULE
 #include <cstdint>
 #include <array>

diff --git a/interface/descriptors/DescriptorSetLayout.cppm b/interface/descriptors/DescriptorSetLayout.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #include <cassert>
 #ifndef VKU_USE_STD_MODULE
 #include <cstdint>

diff --git a/interface/descriptors/PoolSizes.cppm b/interface/descriptors/PoolSizes.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #ifndef VKU_USE_STD_MODULE
 #include <cstdint>
 #include <ranges>

diff --git a/interface/descriptors/mod.cppm b/interface/descriptors/mod.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #if !defined(VKU_USE_STD_MODULE) && defined(_MSC_VER)
 #include <compare>
 #endif

diff --git a/interface/details/concepts.cppm b/interface/details/concepts.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #ifndef VKU_USE_STD_MODULE
 #include <concepts>
 #include <tuple>

diff --git a/interface/details/container/OnDemandCounterStorage.cppm b/interface/details/container/OnDemandCounterStorage.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #ifndef VKU_USE_STD_MODULE
 #include <cstdint>
 #include <deque>

diff --git a/interface/details/ranges.cppm b/interface/details/ranges.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #include <version>
 #ifndef VKU_USE_STD_MODULE
 #include <cstdint>

diff --git a/interface/details/to_string.cppm b/interface/details/to_string.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #ifndef VKU_USE_STD_MODULE
 #include <format>
 #include <source_location>

diff --git a/interface/details/tuple.cppm b/interface/details/tuple.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #ifndef VKU_USE_STD_MODULE
 #include <cstdint>
 #include <tuple>

diff --git a/interface/images/AllocatedImage.cppm b/interface/images/AllocatedImage.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #ifndef VKU_USE_STD_MODULE
 #include <tuple>
 #include <utility>

diff --git a/interface/images/Image.cppm b/interface/images/Image.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #include <cassert>
 #ifndef VKU_USE_STD_MODULE
 #include <cstdint>

diff --git a/interface/images/mod.cppm b/interface/images/mod.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #if !defined(VKU_USE_STD_MODULE) && defined(_MSC_VER)
 #include <compare>
 #endif

diff --git a/interface/mod.cppm b/interface/mod.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #if !defined(VKU_USE_STD_MODULE) && defined(_MSC_VER)
 #include <compare>
 #endif

diff --git a/interface/pipelines/Shader.cppm b/interface/pipelines/Shader.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #include <cerrno>
 #ifndef VKU_USE_STD_MODULE
 #include <cstdint>

diff --git a/interface/pipelines/mod.cppm b/interface/pipelines/mod.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #ifndef VKU_USE_STD_MODULE
 #include <cstdint>
 #include <array>

diff --git a/interface/queue.cppm b/interface/queue.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #ifndef VKU_USE_STD_MODULE
 #include <cstdint>
 #include <optional>

diff --git a/interface/rendering/Attachment.cppm b/interface/rendering/Attachment.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #ifndef VKU_USE_STD_MODULE
 #include <vector>
 #ifdef _MSC_VER

diff --git a/interface/rendering/AttachmentGroup.cppm b/interface/rendering/AttachmentGroup.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #include <cassert>
 #ifndef VKU_USE_STD_MODULE
 #include <cstdint>

diff --git a/interface/rendering/AttachmentGroupBase.cppm b/interface/rendering/AttachmentGroupBase.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #ifndef VKU_USE_STD_MODULE
 #include <concepts>
 #include <forward_list>

diff --git a/interface/rendering/MsaaAttachment.cppm b/interface/rendering/MsaaAttachment.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #ifndef VKU_USE_STD_MODULE
 #include <vector>
 #ifdef _MSC_VER

diff --git a/interface/rendering/MsaaAttachmentGroup.cppm b/interface/rendering/MsaaAttachmentGroup.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #include <cassert>
 #ifndef VKU_USE_STD_MODULE
 #include <cstdint>

diff --git a/interface/rendering/mod.cppm b/interface/rendering/mod.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #if !defined(VKU_USE_STD_MODULE) && defined(_MSC_VER)
 #include <compare>
 #endif

diff --git a/interface/utils/RefHolder.cppm b/interface/utils/RefHolder.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #ifndef VKU_USE_STD_MODULE
 #include <concepts>
 #include <functional>

diff --git a/interface/utils/mod.cppm b/interface/utils/mod.cppm
@@ -1,5 +1,7 @@
 module;
 
+#include <macros.hpp>
+
 #include <cassert>
 #ifndef VKU_USE_STD_MODULE
 #include <cstdint>