@@ -235,12 +235,13 @@ else()
235235 jemalloc INTERFACE ${jemalloc_targ_BINARY_DIR} /lib/libjemalloc.a)
236236 add_dependencies (jemalloc jemalloc_prod)
237237
238+ set (JEMALLOC_FOUND TRUE )
238239 set (JEMALLOC_LIBRARY_DIRS ${jemalloc_targ_BINARY_DIR} /lib)
239240 set (JEMALLOC_INCLUDE_DIRS ${jemalloc_targ_BINARY_DIR} /include )
240241 set (JEMALLOC_LIBRARIES ${jemalloc_targ_BINARY_DIR} /lib/libjemalloc.a)
241242endif ()
242243
243- if (JEMALLOC_FOUND OR JEMALLOC_LIBRARIES )
244+ if (JEMALLOC_FOUND)
244245 set (UMF_POOL_JEMALLOC_ENABLED TRUE )
245246 # add PATH to DLL on Windows
246247 set (DLL_PATH_LIST
@@ -263,7 +264,7 @@ if(NOT UMF_DISABLE_HWLOC AND (NOT UMF_LINK_HWLOC_STATICALLY))
263264 pkg_check_modules(LIBHWLOC hwloc>=2.3.0)
264265 if (NOT LIBHWLOC_FOUND)
265266 find_package (LIBHWLOC 2.3.0 COMPONENTS hwloc)
266- if (LIBHWLOC_LIBRARIES )
267+ if (LIBHWLOC_FOUND )
267268 set (LIBHWLOC_AVAILABLE TRUE )
268269 endif ()
269270 endif ()
@@ -327,6 +328,7 @@ else()
327328 DIRECTORY )
328329 set (LIBHWLOC_LIBRARIES ${HWLOC_LIB_PATH} )
329330 set (LIBHWLOC_INCLUDE_DIRS ${hwloc_targ_BINARY_DIR} /include )
331+ set (LIBHWLOC_FOUND TRUE )
330332 else () # not Windows
331333 FetchContent_Declare(
332334 hwloc_targ
@@ -369,6 +371,7 @@ else()
369371 set (LIBHWLOC_LIBRARY_DIRS ${hwloc_targ_BINARY_DIR} /lib)
370372 set (LIBHWLOC_INCLUDE_DIRS ${hwloc_targ_BINARY_DIR} /include )
371373 set (LIBHWLOC_LIBRARIES ${hwloc_targ_BINARY_DIR} /lib/libhwloc.a)
374+ set (LIBHWLOC_FOUND TRUE )
372375 endif ()
373376 endif () # UMF_LINK_HWLOC_STATICALLY
374377
@@ -444,7 +447,7 @@ if(UMF_BUILD_LEVEL_ZERO_PROVIDER)
444447 endif ()
445448 message (STATUS "LEVEL_ZERO_INCLUDE_DIRS = ${LEVEL_ZERO_INCLUDE_DIRS} " )
446449
447- if (ZE_LOADER_LIBRARIES )
450+ if (ZE_LOADER_FOUND )
448451 set (UMF_LEVEL_ZERO_ENABLED TRUE )
449452 else ()
450453 message (
@@ -500,7 +503,7 @@ if(UMF_BUILD_CUDA_PROVIDER)
500503 endif ()
501504 message (STATUS "CUDA_INCLUDE_DIRS = ${CUDA_INCLUDE_DIRS} " )
502505
503- if (CUDA_LIBRARIES )
506+ if (CUDA_FOUND )
504507 set (UMF_CUDA_ENABLED TRUE )
505508 else ()
506509 message (
@@ -722,7 +725,7 @@ pkg_check_modules(TBB tbb)
722725if (NOT TBB_FOUND)
723726 find_package (TBB OPTIONAL_COMPONENTS tbb)
724727endif ()
725- if (TBB_FOUND OR TBB_LIBRARY_DIRS )
728+ if (TBB_FOUND)
726729 # add PATH to DLL on Windows
727730 set (DLL_PATH_LIST "${DLL_PATH_LIST} ;PATH=path_list_append:${TBB_DLL_DIRS} " )
728731 set (UMF_POOL_SCALABLE_ENABLED TRUE )
0 commit comments