@@ -235,12 +235,13 @@ else()
235
235
jemalloc INTERFACE ${jemalloc_targ_BINARY_DIR} /lib/libjemalloc.a )
236
236
add_dependencies (jemalloc jemalloc_prod )
237
237
238
+ set (JEMALLOC_FOUND TRUE )
238
239
set (JEMALLOC_LIBRARY_DIRS ${jemalloc_targ_BINARY_DIR} /lib )
239
240
set (JEMALLOC_INCLUDE_DIRS ${jemalloc_targ_BINARY_DIR} /include )
240
241
set (JEMALLOC_LIBRARIES ${jemalloc_targ_BINARY_DIR} /lib/libjemalloc.a )
241
242
endif ()
242
243
243
- if (JEMALLOC_FOUND OR JEMALLOC_LIBRARIES )
244
+ if (JEMALLOC_FOUND )
244
245
set (UMF_POOL_JEMALLOC_ENABLED TRUE )
245
246
# add PATH to DLL on Windows
246
247
set (DLL_PATH_LIST
@@ -263,12 +264,9 @@ if(NOT UMF_DISABLE_HWLOC AND (NOT UMF_LINK_HWLOC_STATICALLY))
263
264
pkg_check_modules (LIBHWLOC hwloc>=2.3.0 )
264
265
if (NOT LIBHWLOC_FOUND )
265
266
find_package (LIBHWLOC 2.3.0 COMPONENTS hwloc )
266
- if (LIBHWLOC_LIBRARIES )
267
- set (LIBHWLOC_AVAILABLE TRUE )
268
- endif ()
269
267
endif ()
270
268
271
- if (LIBHWLOC_AVAILABLE OR LIBHWLOC_FOUND )
269
+ if (LIBHWLOC_FOUND )
272
270
# add PATH to DLL on Windows
273
271
set (DLL_PATH_LIST
274
272
"${DLL_PATH_LIST} ;PATH=path_list_append:${LIBHWLOC_DLL_DIRS} " )
@@ -327,6 +325,7 @@ else()
327
325
DIRECTORY )
328
326
set (LIBHWLOC_LIBRARIES ${HWLOC_LIB_PATH} )
329
327
set (LIBHWLOC_INCLUDE_DIRS ${hwloc_targ_BINARY_DIR} /include )
328
+ set (LIBHWLOC_FOUND TRUE )
330
329
else () # not Windows
331
330
FetchContent_Declare (
332
331
hwloc_targ
@@ -369,6 +368,7 @@ else()
369
368
set (LIBHWLOC_LIBRARY_DIRS ${hwloc_targ_BINARY_DIR} /lib )
370
369
set (LIBHWLOC_INCLUDE_DIRS ${hwloc_targ_BINARY_DIR} /include )
371
370
set (LIBHWLOC_LIBRARIES ${hwloc_targ_BINARY_DIR} /lib/libhwloc.a )
371
+ set (LIBHWLOC_FOUND TRUE )
372
372
endif ()
373
373
endif () # UMF_LINK_HWLOC_STATICALLY
374
374
@@ -444,7 +444,7 @@ if(UMF_BUILD_LEVEL_ZERO_PROVIDER)
444
444
endif ()
445
445
message (STATUS "LEVEL_ZERO_INCLUDE_DIRS = ${LEVEL_ZERO_INCLUDE_DIRS} " )
446
446
447
- if (ZE_LOADER_LIBRARIES )
447
+ if (ZE_LOADER_FOUND )
448
448
set (UMF_LEVEL_ZERO_ENABLED TRUE )
449
449
else ()
450
450
message (
@@ -500,7 +500,7 @@ if(UMF_BUILD_CUDA_PROVIDER)
500
500
endif ()
501
501
message (STATUS "CUDA_INCLUDE_DIRS = ${CUDA_INCLUDE_DIRS} " )
502
502
503
- if (CUDA_LIBRARIES )
503
+ if (CUDA_FOUND )
504
504
set (UMF_CUDA_ENABLED TRUE )
505
505
else ()
506
506
message (
@@ -722,7 +722,7 @@ pkg_check_modules(TBB tbb)
722
722
if (NOT TBB_FOUND )
723
723
find_package (TBB OPTIONAL_COMPONENTS tbb )
724
724
endif ()
725
- if (TBB_FOUND OR TBB_LIBRARY_DIRS )
725
+ if (TBB_FOUND )
726
726
# add PATH to DLL on Windows
727
727
set (DLL_PATH_LIST "${DLL_PATH_LIST} ;PATH=path_list_append:${TBB_DLL_DIRS} " )
728
728
set (UMF_POOL_SCALABLE_ENABLED TRUE )
0 commit comments