several additional fixes caused by an error in rebase

cmake/FindGasnet.cmake

@@ -11,25 +11,25 @@ set(GASNET_UDP_FOUND FALSE)
 set(GASNET_SMP_FOUND FALSE)
 
 if(HPX_WITH_NETWORKING)
-   pkg_check_modules(GASNET QUIET gasnet-mpi-seq)
-   if(NOT GASNET_FOUND)
-      pkg_check_modules(PC_GASNET QUIET gasnet-udp-seq)
-      if(NOT GASNET_FOUND)
-         hpx_error("Could not find GASNET MPI/udp please set the PKG_CONFIG_PATH environment variable")
-      else()
-         set(GASNET_UDP_FOUND TRUE)
-      endif()
-   else()
-      set(GASNET_MPI_FOUND TRUE)
-      hpx_setup_mpi()
-   endif()
+  pkg_check_modules(GASNET QUIET gasnet-mpi-seq)
+  if(NOT GASNET_FOUND)
+    pkg_check_modules(PC_GASNET QUIET gasnet-udp-seq)
+    if(NOT GASNET_FOUND)
+      hpx_error("Could not find GASNET MPI/udp please set the PKG_CONFIG_PATH environment variable")
+    else()
+      set(GASNET_UDP_FOUND TRUE)
+    endif()
+  else()
+    set(GASNET_MPI_FOUND TRUE)
+    hpx_setup_mpi()
+  endif()
 else()
-   pkg_check_modules(GASNET QUIET gasnet-smp-seq)
-   if(NOT GASNET_FOUND)
-      hpx_error("Could not find GASNET please set the PKG_CONFIG_PATH environment variable")
-   else()
-      set(GASNET_SMP_FOUND TRUE)
-   endif()
+  pkg_check_modules(GASNET QUIET gasnet-smp-seq)
+  if(NOT GASNET_FOUND)
+    hpx_error("Could not find GASNET please set the PKG_CONFIG_PATH environment variable")
+  else()
+    set(GASNET_SMP_FOUND TRUE)
+  endif()
 endif()
 
 if(NOT GASNET_INCLUDE_DIRS OR NOT GASNET_LIBRARY_DIRS)

libs/core/io_service/CMakeLists.txt

@@ -7,13 +7,13 @@
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 set(io_service_headers
-    hpx/io_service/io_service_pool.hpp hpx/io_service/io_service_pool.hpp
+    hpx/io_service/io_service_pool.hpp hpx/io_service/io_service_pool_fwd.hpp
     hpx/io_service/io_service_thread_pool.hpp
 )
 
 # cmake-format: off
 set(io_service_compat_headers
-    hpx/util/io_service_pool.hpp => hpx/modules/io_service.hpp
+    hpx/util/io_service_pool_fwd.hpp => hpx/modules/io_service.hpp
 )
 # cmake-format: on
 

libs/core/io_service/include/hpx/io_service/io_service_pool_fwd.hpp

@@ -0,0 +1,14 @@
+//  Copyright (c) 2023 Hartmut Kaiser
+//
+//  SPDX-License-Identifier: BSL-1.0
+//  Distributed under the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#pragma once
+
+#include <hpx/config.hpp>
+
+namespace hpx::util {
+
+    class HPX_CORE_EXPORT io_service_pool;
+}    // namespace hpx::util