Add HPXStdexecTarget.cmake file export

STEllAR-GROUP · Aug 23, 2024 · 79e9ce8 · 79e9ce8
1 parent 8a64f0f
commit 79e9ce8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/cmake/HPX_SetupStdexec.cmake b/cmake/HPX_SetupStdexec.cmake
@@ -42,7 +42,7 @@ if(HPX_WITH_STDEXEC)
       )
 
       fetchcontent_getproperties(Stdexec)
-      if(NOT stdexec_POPULATED)
+      if(NOT Stdexec_POPULATED)
         fetchcontent_populate(Stdexec)
       endif()
       set(Stdexec_ROOT ${stdexec_SOURCE_DIR})
@@ -76,14 +76,15 @@ if(HPX_WITH_STDEXEC)
       install(
         EXPORT HPXStdexecTarget
         NAMESPACE Stdexec::
+        FILE HPXStdexecTarget.cmake
         DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${HPX_PACKAGE_NAME}
         COMPONENT cmake
       )
 
+      # TODO: Enforce a single spelling
       add_library(Stdexec::Stdexec ALIAS Stdexec)
       add_library(STDEXEC::stdexec ALIAS Stdexec)
 
-      # fetchcontent_makeavailable(Stdexec)
     endif()
 
   else()

diff --git a/cmake/templates/HPXConfig.cmake.in b/cmake/templates/HPXConfig.cmake.in
@@ -30,11 +30,13 @@ endif()
 
 # Stdexec can be installed by HPX or externally installed. In the first case we use
 # exported targets, in the second we find Stdexec again using find_package.
-if(HPX_WITH_FETCH_STDEXEC)
-  include("${CMAKE_CURRENT_LIST_DIR}/HPXStdexecTarget.cmake")
-else()
-  set(Stdexec_ROOT "@Stdexec_ROOT@")
-  include(HPX_SetupStdexec)
+if(HPX_WITH_STDEXEC)
+  if(HPX_WITH_FETCH_STDEXEC)
+    include("${CMAKE_CURRENT_LIST_DIR}/HPXStdexecTarget.cmake")
+  else()
+    set(Stdexec_ROOT "@Stdexec_ROOT@")
+    include(HPX_SetupStdexec)
+  endif()
 endif()