Removed hpx_auto_wrap.cpp and included HPX_AUTO_WRAP_MAIN_ACTIVATE functionality in the hpx_wrap.cpp which is defined to the target the with the help of target_compile_definitions in the CMakelists.txt file

Signed-off-by: Bharath <bharath.kollanur@gmail.com>

Author: kollanur

libs/CMakeLists.txt

@@ -186,7 +186,8 @@ target_link_libraries(
 )
 add_library(hpx_interface_auto_wrap_main INTERFACE)
 target_link_libraries(
-  hpx_interface_auto_wrap_main INTERFACE $<${_is_executable}:HPXInternal::hpx_auto_wrap>
+  hpx_interface_auto_wrap_main
+  INTERFACE $<${_is_executable}:HPXInternal::hpx_auto_wrap>
 )
 
 target_link_libraries(wrap_main INTERFACE hpx_interface_wrap_main)
@@ -219,7 +220,9 @@ target_compile_definitions(
 )
 
 set(hpx_targets hpx wrap_main auto_wrap_main init plugin component)
-set(hpx_internal_targets hpx_full hpx_interface hpx_interface_wrap_main hpx_interface_auto_wrap_main)
+set(hpx_internal_targets hpx_full hpx_interface hpx_interface_wrap_main
+                         hpx_interface_auto_wrap_main
+)
 
 # cmake-format: off
 install(

tests/unit/init/auto_wrap_main.cpp

@@ -8,15 +8,15 @@
 #include <hpx/modules/testing.hpp>
 #include <hpx/runtime_local/runtime_local.hpp>
 
-int main(int, char**) {
+int main(int, char**)
+{
     // The wrapper should have initialized HPX runtime before reaching main.
     HPX_TEST(hpx::get_runtime_ptr() != nullptr);
 
-    // Verify that calling thread is an HPX thread by launching another 
+    // Verify that calling thread is an HPX thread by launching another
     // HPX task and waiting for its result.
-    auto f = hpx::async([] { return (hpx::get_runtime_ptr() != nullptr);});
+    auto f = hpx::async([] { return (hpx::get_runtime_ptr() != nullptr); });
     HPX_TEST(f.get());
 
     return hpx::util::report_errors();
-
 }

wrap/CMakeLists.txt

@@ -20,28 +20,15 @@ set(hpx_wrap_SOURCES
 )
 list(APPEND hpx_wrap_SOURCES hpx_wrap.cpp hpx_main.cpp)
 
-set(hpx_auto_wrap_SOURCES
-    ""
-    CACHE INTERNAL "Sources for libhpx_auto_wrap." FORCE
-)
-list(APPEND hpx_auto_wrap_SOURCES hpx_auto_wrap.cpp hpx_main.cpp)
-
 # make source groups
 set(hpx_wrap_SOURCE_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/src)
 list(TRANSFORM hpx_wrap_SOURCES PREPEND ${hpx_wrap_SOURCE_ROOT}/)
-list(TRANSFORM hpx_auto_wrap_SOURCES PREPEND ${hpx_wrap_SOURCE_ROOT}/)
 add_hpx_source_group(
   NAME hpx_wrap
   CLASS "Source Files"
   ROOT "${hpx_wrap_SOURCE_ROOT}"
   TARGETS ${hpx_wrap_SOURCES}
 )
-add_hpx_source_group(
-  NAME hpx_auto_wrap
-  CLASS "Source Files"
-  ROOT "${hpx_wrap_SOURCE_ROOT}"
-  TARGETS ${hpx_auto_wrap_SOURCES}
-)
 
 set(hpx_wrap_HEADER_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/include)
 list(TRANSFORM hpx_wrap_HEADERS PREPEND ${hpx_wrap_HEADER_ROOT}/)
@@ -51,18 +38,12 @@ add_hpx_source_group(
   ROOT "${hpx_wrap_HEADER_ROOT}"
   TARGETS ${hpx_wrap_HEADERS}
 )
-add_hpx_source_group(
-  NAME hpx_auto_wrap
-  CLASS "Header Files"
-  ROOT "${hpx_wrap_HEADER_ROOT}"
-  TARGETS ${hpx_wrap_HEADERS}
-)
 
 add_library(
   hpx_wrap STATIC ${hpx_wrap_SOURCES} ${hpx_wrap_HEADERS} ${config_header}
 )
 add_library(
-  hpx_auto_wrap STATIC ${hpx_auto_wrap_SOURCES} ${hpx_wrap_HEADERS} ${config_header}
+  hpx_auto_wrap STATIC ${hpx_wrap_SOURCES} ${hpx_wrap_HEADERS} ${config_header}
 )
 
 set_target_properties(hpx_wrap PROPERTIES POSITION_INDEPENDENT_CODE ON)
@@ -79,10 +60,12 @@ set_target_properties(hpx_auto_wrap PROPERTIES POSITION_INDEPENDENT_CODE ON)
 target_link_libraries(hpx_auto_wrap PRIVATE hpx_full)
 target_link_libraries(hpx_auto_wrap PRIVATE hpx_init)
 target_link_libraries(hpx_auto_wrap PRIVATE hpx_private_flags)
-target_compile_definitions(hpx_auto_wrap PRIVATE HPX_LIBRARY_EXPORTS)
+target_compile_definitions(
+  hpx_auto_wrap PRIVATE HPX_LIBRARY_EXPORTS HPX_AUTO_WRAP_MAIN_ACTIVATE
+)
 target_include_directories(
   hpx_auto_wrap PUBLIC $<BUILD_INTERFACE:${hpx_wrap_HEADER_ROOT}>
-                  $<INSTALL_INTERFACE:include>
+                       $<INSTALL_INTERFACE:include>
 )
 
 if(HPX_WITH_CXX_MODULES)

wrap/src/hpx_auto_wrap.cpp

@@ -5,6 +5,7 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <hpx/config.hpp>
+#include <hpx/hpx_init.hpp>
 
 // The following implementation has been divided for Linux and Mac OSX
 #if defined(HPX_HAVE_DYNAMIC_HPX_MAIN) &&                                      \
@@ -17,14 +18,27 @@ namespace hpx_start {
     // include_libhpx_wrap is a weak symbol which helps to determine the course
     // of function calls at runtime. It has a default value of `false` which
     // corresponds to the program's entry point being main().
-    // It is overridden in hpx/hpx_main.hpp. Thus, inclusion of the header file
+    // It is overridden in hpx/hpx_main.hpp or set as TRUE if HPX_AUTO_WRAP_MAIN_ACTIVATE is defined.
+    // Thus, inclusion of the header file or defining HPX_AUTO_WRAP_MAIN_ACTIVATE
     // will change the program's entry point to HPX's own custom entry point
     // initialize_main. Subsequent calls before entering main() are handled
     // by this code.
     HPX_SYMBOL_EXPORT extern bool include_libhpx_wrap;
-    HPX_SYMBOL_EXPORT bool include_libhpx_wrap __attribute__((weak)) = false;
+    HPX_SYMBOL_EXPORT bool include_libhpx_wrap __attribute__((weak)) =
+#if defined(HPX_AUTO_WRAP_MAIN_ACTIVATE)
+        true;
+#else
+        false;
+#endif
+    // The default application name is populated by including hpx/hpx_main.hpp
+    // or if HPX_AUTO_WRAP_MAIN_ACTIVATE is defined.
     HPX_SYMBOL_EXPORT extern const char* app_name_libhpx_wrap;
-    HPX_SYMBOL_EXPORT const char* app_name_libhpx_wrap __attribute__((weak));
+    HPX_SYMBOL_EXPORT const char* app_name_libhpx_wrap __attribute__((weak)) =
+#if defined(HPX_AUTO_WRAP_MAIN_ACTIVATE)
+        HPX_APPLICATION_STRING;
+#else
+        nullptr;
+#endif
 
     // Provide a definition of is_linked variable defined weak in hpx_main.hpp
     // header. This variable is solely to trigger a different exception when
@@ -34,7 +48,6 @@ namespace hpx_start {
 }    // namespace hpx_start
 
 #include <hpx/hpx_finalize.hpp>
-#include <hpx/hpx_init.hpp>
 #include <hpx/modules/functional.hpp>
 #include <hpx/modules/runtime_configuration.hpp>