Unconditionally use import std with C++23

KhronosGroup · Aug 14, 2024 · b9dd8a2 · b9dd8a2
1 parent 50d2f57
commit b9dd8a2
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 22 deletions.
diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
@@ -806,15 +806,6 @@ void VulkanHppGenerator::generateCppModuleFile() const
 
 module;
 
-// clang-format off
-#include <vulkan/vulkan_hpp_macros.hpp>
-// clang-format on
-
-#if defined( VULKAN_HPP_STD_MODULE )
-import VULKAN_HPP_STD_MODULE;
-import VULKAN_HPP_STD_COMPAT_MODULE;
-#endif
-
 #include <vulkan/${api}.hpp>
 #include <vulkan/${api}_extension_inspection.hpp>
 #include <vulkan/${api}_format_traits.hpp>

diff --git a/snippets/includes.hpp b/snippets/includes.hpp
@@ -6,6 +6,9 @@
 # include <string.h>  // strnlen
 # include <string>    // std::string
 # include <utility>   // std::exchange
+#else
+import VULKAN_HPP_STD_MODULE;
+import VULKAN_HPP_STD_COMPAT_MODULE;
 #endif
 #include <vulkan/${vulkan_h}>
 

diff --git a/snippets/macros.hpp b/snippets/macros.hpp
@@ -77,7 +77,7 @@
 #  define VULKAN_HPP_SUPPORT_SPAN
 #endif
 
-#if !defined( VULKAN_HPP_STD_MODULE ) && ( 23 <= VULKAN_HPP_CPP_VERSION ) && defined( __cpp_lib_modules ) && defined( VULKAN_HPP_ENABLE_STD_MODULE )
+#if ( 23 <= VULKAN_HPP_CPP_VERSION ) && defined( __cpp_lib_modules ) && !defined( VULKAN_HPP_STD_MODULE )
 #  define VULKAN_HPP_STD_MODULE std
 #  define VULKAN_HPP_STD_COMPAT_MODULE std.compat
 #endif

diff --git a/tests/CppStdModule/CMakeLists.txt b/tests/CppStdModule/CMakeLists.txt
@@ -1,7 +1,5 @@
 cmake_minimum_required( VERSION 3.30 )
 
-set(CMAKE_CXX_MODULE_STD ON)
-
 target_compile_features( VulkanHppModule PUBLIC cxx_std_23 )
 target_compile_definitions( VulkanHppModule PUBLIC VULKAN_HPP_ENABLE_STD_MODULE )
 

diff --git a/vulkan/vulkan.cppm b/vulkan/vulkan.cppm
@@ -10,15 +10,6 @@
 
 module;
 
-// clang-format off
-#include <vulkan/vulkan_hpp_macros.hpp>
-// clang-format on
-
-#if defined( VULKAN_HPP_STD_MODULE )
-import VULKAN_HPP_STD_MODULE;
-import VULKAN_HPP_STD_COMPAT_MODULE;
-#endif
-
 #include <vulkan/vulkan.hpp>
 #include <vulkan/vulkan_extension_inspection.hpp>
 #include <vulkan/vulkan_format_traits.hpp>

diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp
@@ -16,6 +16,9 @@
 #  include <string.h>  // strnlen
 #  include <string>    // std::string
 #  include <utility>   // std::exchange
+#else
+import VULKAN_HPP_STD_MODULE;
+import VULKAN_HPP_STD_COMPAT_MODULE;
 #endif
 #include <vulkan/vulkan.h>
 

diff --git a/vulkan/vulkan_hpp_macros.hpp b/vulkan/vulkan_hpp_macros.hpp
@@ -87,7 +87,7 @@
 #  define VULKAN_HPP_SUPPORT_SPAN
 #endif
 
-#if !defined( VULKAN_HPP_STD_MODULE ) && ( 23 <= VULKAN_HPP_CPP_VERSION ) && defined( __cpp_lib_modules ) && defined( VULKAN_HPP_ENABLE_STD_MODULE )
+#if ( 23 <= VULKAN_HPP_CPP_VERSION ) && defined( __cpp_lib_modules ) && !defined( VULKAN_HPP_STD_MODULE )
 #  define VULKAN_HPP_STD_MODULE        std
 #  define VULKAN_HPP_STD_COMPAT_MODULE std.compat
 #endif