Make the C++20 Module Optional. (#195)

gpx1000 · web-flow · commit 9c43d60c107a · 2025-10-10T17:57:56.000+02:00
* Make hte C++20 Module Optional.  Still need to adjust the tutorial text for this change.

* Make C++20 module support disabled by default for Vulkan tutorial

- Update tutorial documentation to reflect optional module usage.
- Adjust CMake option `ENABLE_CPP20_MODULE` default to `OFF`.
- Incorporate fallback to traditional header-based includes when modules are disabled.
- Clarify enablement steps and compatibility details in example code and instructions.

* Adjust CMake configuration for VulkanCppModule

- Change `target_include_directories` from `PRIVATE` to `PUBLIC` for broader access.
- Add MSVC-specific compiler options to support proper C++20 module compatibility.
diff --git a/attachments/00_base_code.cpp b/attachments/00_base_code.cpp
@@ -1,5 +1,5 @@
 #include <memory>
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/01_instance_creation.cpp b/attachments/01_instance_creation.cpp
@@ -4,7 +4,7 @@
 #include <cstdlib>
 #include <memory>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/02_validation_layers.cpp b/attachments/02_validation_layers.cpp
@@ -6,7 +6,7 @@
 #include <memory>
 #include <algorithm>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/03_physical_device_selection.cpp b/attachments/03_physical_device_selection.cpp
@@ -6,7 +6,7 @@
 #include <memory>
 #include <algorithm>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/04_logical_device.cpp b/attachments/04_logical_device.cpp
@@ -7,7 +7,7 @@
 #include <memory>
 #include <algorithm>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/05_window_surface.cpp b/attachments/05_window_surface.cpp
@@ -6,7 +6,7 @@
 #include <memory>
 #include <algorithm>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/06_swap_chain_creation.cpp b/attachments/06_swap_chain_creation.cpp
@@ -8,7 +8,7 @@
 #include <algorithm>
 #include <limits>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/07_image_views.cpp b/attachments/07_image_views.cpp
@@ -8,7 +8,7 @@
 #include <limits>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/08_graphics_pipeline.cpp b/attachments/08_graphics_pipeline.cpp
@@ -8,7 +8,7 @@
 #include <limits>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/09_shader_modules.cpp b/attachments/09_shader_modules.cpp
@@ -9,7 +9,7 @@
 #include <limits>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/10_fixed_functions.cpp b/attachments/10_fixed_functions.cpp
@@ -9,7 +9,7 @@
 #include <limits>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/12_graphics_pipeline_complete.cpp b/attachments/12_graphics_pipeline_complete.cpp
@@ -9,7 +9,7 @@
 #include <limits>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/14_command_buffers.cpp b/attachments/14_command_buffers.cpp
@@ -9,7 +9,7 @@
 #include <limits>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/15_hello_triangle.cpp b/attachments/15_hello_triangle.cpp
@@ -9,7 +9,7 @@
 #include <limits>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/16_frames_in_flight.cpp b/attachments/16_frames_in_flight.cpp
@@ -9,7 +9,7 @@
 #include <limits>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/17_swap_chain_recreation.cpp b/attachments/17_swap_chain_recreation.cpp
@@ -9,7 +9,7 @@
 #include <limits>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/18_vertex_input.cpp b/attachments/18_vertex_input.cpp
@@ -10,7 +10,7 @@
 #include <array>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/19_vertex_buffer.cpp b/attachments/19_vertex_buffer.cpp
@@ -10,7 +10,7 @@
 #include <array>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/20_staging_buffer.cpp b/attachments/20_staging_buffer.cpp
@@ -10,7 +10,7 @@
 #include <array>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/21_index_buffer.cpp b/attachments/21_index_buffer.cpp
@@ -10,7 +10,7 @@
 #include <array>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/22_descriptor_layout.cpp b/attachments/22_descriptor_layout.cpp
@@ -11,7 +11,7 @@
 #include <chrono>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/23_descriptor_sets.cpp b/attachments/23_descriptor_sets.cpp
@@ -11,7 +11,7 @@
 #include <chrono>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/24_texture_image.cpp b/attachments/24_texture_image.cpp
@@ -11,7 +11,7 @@
 #include <chrono>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/25_sampler.cpp b/attachments/25_sampler.cpp
@@ -11,7 +11,7 @@
 #include <chrono>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/26_texture_mapping.cpp b/attachments/26_texture_mapping.cpp
@@ -11,7 +11,7 @@
 #include <chrono>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/27_depth_buffering.cpp b/attachments/27_depth_buffering.cpp
@@ -11,7 +11,7 @@
 #include <chrono>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/28_model_loading.cpp b/attachments/28_model_loading.cpp
@@ -11,7 +11,7 @@
 #include <chrono>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/29_mipmapping.cpp b/attachments/29_mipmapping.cpp
@@ -11,7 +11,7 @@
 #include <chrono>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/30_multisampling.cpp b/attachments/30_multisampling.cpp
@@ -11,7 +11,7 @@
 #include <chrono>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/31_compute_shader.cpp b/attachments/31_compute_shader.cpp
@@ -15,7 +15,7 @@
 #include <random>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/32_ecosystem_utilities.cpp b/attachments/32_ecosystem_utilities.cpp
@@ -12,7 +12,7 @@
 #include <optional>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/33_vulkan_profiles.cpp b/attachments/33_vulkan_profiles.cpp
@@ -12,7 +12,7 @@
 #include <optional>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/34_android.cpp b/attachments/34_android.cpp
@@ -12,7 +12,7 @@
 #include <optional>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/35_gltf_ktx.cpp b/attachments/35_gltf_ktx.cpp
@@ -12,7 +12,7 @@
 #include <optional>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/36_multiple_objects.cpp b/attachments/36_multiple_objects.cpp
@@ -12,7 +12,7 @@
 #include <optional>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/37_multithreading.cpp b/attachments/37_multithreading.cpp
@@ -17,7 +17,7 @@
 #include <future>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/38_ray_tracing.cpp b/attachments/38_ray_tracing.cpp
@@ -10,7 +10,7 @@
 #include <array>
 #include <chrono>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
diff --git a/attachments/CMake/FindVulkan.cmake b/attachments/CMake/FindVulkan.cmake
@@ -311,14 +311,15 @@ find_path(Vulkan_INCLUDE_DIR
     HINTS
     ${_Vulkan_hint_include_search_paths}
 )
+message(STATUS "vulkan_include_dir ${Vulkan_INCLUDE_DIR} search paths ${_Vulkan_hint_include_search_paths}")
 mark_as_advanced(Vulkan_INCLUDE_DIR)
 
 find_library(Vulkan_LIBRARY
     NAMES ${_Vulkan_library_name}
     HINTS
     ${_Vulkan_hint_library_search_paths}
 )
-message(STATUS vulkan_library ${Vulkan_LIBRARY} search paths ${_Vulkan_hint_library_search_paths})
+message(STATUS "vulkan_library ${Vulkan_LIBRARY} search paths ${_Vulkan_hint_library_search_paths}")
 mark_as_advanced(Vulkan_LIBRARY)
 
 find_library(Vulkan_Layer_API_DUMP
diff --git a/attachments/CMakeLists.txt b/attachments/CMakeLists.txt
diff --git a/en/00_Introduction.adoc b/en/00_Introduction.adoc
diff --git a/en/02_Development_environment.adoc b/en/02_Development_environment.adoc
diff --git a/en/03_Drawing_a_triangle/00_Setup/00_Base_code.adoc b/en/03_Drawing_a_triangle/00_Setup/00_Base_code.adoc
diff --git a/en/14_Android.adoc b/en/14_Android.adoc
