From 79e9ce89e837e8905f05b40e9adffc9f6f4e238f Mon Sep 17 00:00:00 2001 From: isidorostsa Date: Fri, 23 Aug 2024 12:39:45 +0300 Subject: [PATCH] Add HPXStdexecTarget.cmake file export --- cmake/HPX_SetupStdexec.cmake | 5 +++-- cmake/templates/HPXConfig.cmake.in | 12 +++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/cmake/HPX_SetupStdexec.cmake b/cmake/HPX_SetupStdexec.cmake index ab4f68b31da..13c9f8f518d 100644 --- 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 index 154fac72fba..3c5161690bd 100644 --- 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()