Adapt HPX module iterator_support to C++ modules

Signed-off-by: Hartmut Kaiser <[email protected]>

Author: hkaiser

cmake/HPX_AddModule.cmake

@@ -516,7 +516,6 @@ function(add_hpx_module libname modulename)
     # core.
     if(HPX_WITH_CXX_MODULES)
       hpx_configure_module_consumer(hpx_${modulename} hpx_core_module_if)
-      target_link_libraries(hpx_${modulename} PRIVATE hpx_core_module_if)
     endif()
   endif()
 
@@ -674,10 +673,18 @@ function(add_hpx_module libname modulename)
     target_link_libraries(hpx_${libname} PRIVATE ${${modulename}_OBJECTS})
   endif()
 
+  set(_hpx_prev_scan "${CMAKE_CXX_SCAN_FOR_MODULES}")
+  if(HPX_WITH_CXX_MODULES AND ${modulename}_GLOBAL_HEADER_MODULE_GEN)
+    set(CMAKE_CXX_SCAN_FOR_MODULES ON)
+  endif()
+
   foreach(dir ${${modulename}_CMAKE_SUBDIRS})
     add_subdirectory(${dir})
   endforeach(dir)
 
+  # Restore previous default so sibling modules are unaffected.
+  set(CMAKE_CXX_SCAN_FOR_MODULES "${_hpx_prev_scan}")
+
   create_configuration_summary(
     "    Module configuration (${modulename}):" "${modulename}"
   )

cmake/HPX_SetupTarget.cmake

@@ -225,9 +225,20 @@ function(hpx_setup_target target)
 
   set_target_properties(${target} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
-  if(HPX_WITH_CXX_MODULES OR ${target}_SCAN_FOR_MODULES)
+  if(HPX_WITH_CXX_MODULES AND ${target}_SCAN_FOR_MODULES)
     hpx_configure_module_consumer(${target} hpx_core_module_if)
   else()
+    # If modules are enabled, Clang emits DWARF v5, which requires using lld
+    # instead of ld.
+    if(HPX_WITH_CXX_MODULES AND (CMAKE_CXX_COMPILER_ID MATCHES "Clang"
+                                 OR CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
+    )
+      get_target_property(_type ${target} TYPE)
+      if((_type STREQUAL "SHARED_LIBRARY") OR (_type STREQUAL "EXECUTABLE"))
+        target_link_options(${target} PRIVATE "-fuse-ld=lld")
+      endif()
+    endif()
+
     set_target_properties(${target} PROPERTIES CXX_SCAN_FOR_MODULES OFF)
     target_compile_definitions(
       ${target} PRIVATE HPX_BINARY_DOESNT_USE_CXX_MODULES

components/containers/partitioned_vector/include/hpx/components/containers/partitioned_vector/partitioned_vector_local_view_iterator.hpp

@@ -10,7 +10,7 @@
 
 #include <hpx/assert.hpp>
 #include <hpx/components/containers/partitioned_vector/detail/view_element.hpp>
-#include <hpx/iterator_support/iterator_adaptor.hpp>
+#include <hpx/modules/iterator_support.hpp>
 
 #include <utility>
 

components/containers/partitioned_vector/include/hpx/components/containers/partitioned_vector/partitioned_vector_segmented_iterator.hpp

@@ -18,8 +18,7 @@
 #include <hpx/algorithms/traits/segmented_iterator_traits.hpp>
 #include <hpx/assert.hpp>
 #include <hpx/async_base/launch_policy.hpp>
-#include <hpx/iterator_support/iterator_adaptor.hpp>
-#include <hpx/iterator_support/iterator_facade.hpp>
+#include <hpx/modules/iterator_support.hpp>
 #include <hpx/naming_base/id_type.hpp>
 
 #include <hpx/components/containers/partitioned_vector/partitioned_vector_component_decl.hpp>

components/containers/partitioned_vector/include/hpx/components/containers/partitioned_vector/partitioned_vector_view_iterator.hpp

@@ -10,7 +10,7 @@
 
 #include <hpx/components/containers/partitioned_vector/detail/view_element.hpp>
 #include <hpx/components/containers/partitioned_vector/partitioned_vector_segmented_iterator.hpp>
-#include <hpx/iterator_support/iterator_facade.hpp>
+#include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/type_support.hpp>
 
 #include <array>

components/containers/partitioned_vector/tests/unit/is_iterator_partitioned_vector.cpp

@@ -5,8 +5,8 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <hpx/config.hpp>
-#include <hpx/iterator_support/iterator_adaptor.hpp>
-#include <hpx/iterator_support/traits/is_iterator.hpp>
+#include <hpx/modules/iterator_support.hpp>
+#include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/testing.hpp>
 
 #if !defined(HPX_COMPUTE_DEVICE_CODE)

components/containers/unordered/include/hpx/components/containers/unordered/unordered_map_segmented_iterator.hpp

@@ -15,7 +15,7 @@
 
 #include <hpx/config.hpp>
 #include <hpx/assert.hpp>
-#include <hpx/iterator_support/iterator_adaptor.hpp>
+#include <hpx/modules/iterator_support.hpp>
 
 #include <hpx/components/containers/unordered/partition_unordered_map_component.hpp>
 

examples/1d_stencil/1d_stencil_channel.cpp

@@ -19,7 +19,7 @@
 #include <hpx/include/components.hpp>
 #include <hpx/include/lcos.hpp>
 #include <hpx/include/util.hpp>
-#include <hpx/iterator_support/counting_shape.hpp>
+#include <hpx/modules/iterator_support.hpp>
 #include <hpx/program_options.hpp>
 
 #include <algorithm>

libs/core/algorithms/include/hpx/algorithms/traits/pointer_category.hpp

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <hpx/iterator_support/traits/is_iterator.hpp>
+#include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/type_support.hpp>
 
 #include <type_traits>

libs/core/algorithms/include/hpx/algorithms/traits/projected.hpp

@@ -11,7 +11,7 @@
 #include <hpx/execution/traits/is_execution_policy.hpp>
 #include <hpx/execution/traits/vector_pack_load_store.hpp>
 #include <hpx/execution/traits/vector_pack_type.hpp>
-#include <hpx/iterator_support/traits/is_iterator.hpp>
+#include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/tag_invoke.hpp>
 #include <hpx/modules/type_support.hpp>