From 40b755a5ca4ab26229e01447d468606d2c9abaac Mon Sep 17 00:00:00 2001 From: Hartmut Kaiser Date: Thu, 24 Aug 2023 11:45:15 -0500 Subject: [PATCH] More fixes for CMake V3.27 --- cmake/FindJemalloc.cmake | 12 ++++++------ cmake/HPX_SetupLCI.cmake | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmake/FindJemalloc.cmake b/cmake/FindJemalloc.cmake index e828a39b5170..c6e111ede3a2 100644 --- 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 index 26b1ecd18076..d34cc6e08ec0 100644 --- 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)