correct default fetching on cpp20

STEllAR-GROUP · May 23, 2024 · 74c1d13 · 74c1d13
1 parent 40285e1
commit 74c1d13
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -584,7 +584,7 @@ hpx_option(
   ADVANCED
 )
 
-if(HPX_WITH_FETCH_STDEXEC)
+if(HPX_WITH_FETCH_STDEXEC OR HPX_WITH_CXX_STANDARD GREATER_EQUAL 20)
   hpx_option(
     HPX_WITH_STDEXEC_TAG STRING "STDEXEC repository tag or branch" "main"
     CATEGORY "Executor"

diff --git a/cmake/HPX_SetupStdexec.cmake b/cmake/HPX_SetupStdexec.cmake
@@ -23,6 +23,11 @@ if(Stdexec_ROOT
     hpx_warn(
       "Both Stdexec_ROOT and HPX_WITH_FETCH_STDEXEC are provided. HPX_WITH_FETCH_STDEXEC is set to OFF."
     )
+  elseif(NOT Stdexec_ROOT AND NOT HPX_WITH_FETCH_STDEXEC)
+    hpx_warn(
+      "Neither Stdexec_ROOT nor HPX_WITH_FETCH_STDEXEC are provided. HPX_WITH_FETCH_STDEXEC is defaulted to ON."
+    )
+    set(HPX_WITH_FETCH_STDEXEC ON)
   endif()
 elseif(HPX_WITH_STDEXEC)
   hpx_error(
@@ -46,7 +51,7 @@ if(HPX_WITH_STDEXEC AND NOT TARGET STDEXEC::stdexec)
     )
     if(UNIX)
       include(FetchContent)
-      message("FETCHING STDEXEC")
+      message("FETCHING STDEXEC TAG: ${HPX_WITH_STDEXEC_TAG}")
 
       fetchcontent_declare(
         Stdexec