Merge #6332

6332: More fixes for CMake V3.27 r=hkaiser a=hkaiser Co-authored-by: Hartmut Kaiser <[email protected]>
STEllAR-GROUP · Aug 28, 2023 · f36d345 · f36d345
2 parents bc993dd + 40b755a
commit f36d345
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/cmake/FindJemalloc.cmake b/cmake/FindJemalloc.cmake
@@ -23,8 +23,8 @@ find_path(
   Jemalloc_INCLUDE_DIR jemalloc/jemalloc.h
   HINTS ${Jemalloc_ROOT}
         ENV
-        Jemalloc_ROOT
-        ${HPX_Jemalloc_ROOT}
+        JEMALLOC_ROOT
+        ${HPX_JEMALLOC_ROOT}
         ${PC_Jemalloc_MINIMAL_INCLUDEDIR}
         ${PC_Jemalloc_MINIMAL_INCLUDE_DIRS}
         ${PC_Jemalloc_INCLUDEDIR}
@@ -39,8 +39,8 @@ if(MSVC)
     Jemalloc_ADDITIONAL_INCLUDE_DIR msvc_compat/strings.h
     HINTS ${Jemalloc_ROOT}
           ENV
-          Jemalloc_ROOT
-          ${HPX_Jemalloc_ROOT}
+          JEMALLOC_ROOT
+          ${HPX_JEMALLOC_ROOT}
           ${PC_Jemalloc_MINIMAL_INCLUDEDIR}
           ${PC_Jemalloc_MINIMAL_INCLUDE_DIRS}
           ${PC_Jemalloc_INCLUDEDIR}
@@ -65,8 +65,8 @@ find_library(
   NAMES jemalloc libjemalloc
   HINTS ${Jemalloc_ROOT}
         ENV
-        Jemalloc_ROOT
-        ${HPX_Jemalloc_ROOT}
+        JEMALLOC_ROOT
+        ${HPX_JEMALLOC_ROOT}
         ${PC_Jemalloc_MINIMAL_LIBDIR}
         ${PC_Jemalloc_MINIMAL_LIBRARY_DIRS}
         ${PC_Jemalloc_LIBDIR}

diff --git a/cmake/HPX_SetupLCI.cmake b/cmake/HPX_SetupLCI.cmake
@@ -38,14 +38,14 @@ macro(hpx_setup_lci)
         )
       else()
         hpx_info(
-          "HPX_WITH_FETCH_LCI=${HPX_WITH_FETCH_LCI}, LCI will be fetched using CMake's FetchContent and installed alongside HPX (HPX_WITH_Lci_TAG=${HPX_WITH_Lci_TAG})"
+          "HPX_WITH_FETCH_LCI=${HPX_WITH_FETCH_LCI}, LCI will be fetched using CMake's FetchContent and installed alongside HPX (HPX_WITH_LCI_TAG=${HPX_WITH_LCI_TAG})"
         )
       endif()
       include(FetchContent)
       fetchcontent_declare(
         lci
         GIT_REPOSITORY https://github.com/uiuc-hpc/LC.git
-        GIT_TAG ${HPX_WITH_Lci_TAG}
+        GIT_TAG ${HPX_WITH_LCI_TAG}
       )
 
       fetchcontent_getproperties(lci)