Skip to content

Commit c417177

Browse files
committed
Use *_FOUND in CMake files
Fixes: #1192 Signed-off-by: Lukasz Dorau <[email protected]>
1 parent 3df39a6 commit c417177

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -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)
241242
endif()
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,12 +264,9 @@ 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-
set(LIBHWLOC_AVAILABLE TRUE)
268-
endif()
269267
endif()
270268

271-
if(LIBHWLOC_AVAILABLE OR LIBHWLOC_FOUND)
269+
if(LIBHWLOC_FOUND)
272270
# add PATH to DLL on Windows
273271
set(DLL_PATH_LIST
274272
"${DLL_PATH_LIST};PATH=path_list_append:${LIBHWLOC_DLL_DIRS}")
@@ -327,6 +325,7 @@ else()
327325
DIRECTORY)
328326
set(LIBHWLOC_LIBRARIES ${HWLOC_LIB_PATH})
329327
set(LIBHWLOC_INCLUDE_DIRS ${hwloc_targ_BINARY_DIR}/include)
328+
set(LIBHWLOC_FOUND TRUE)
330329
else() # not Windows
331330
FetchContent_Declare(
332331
hwloc_targ
@@ -369,6 +368,7 @@ else()
369368
set(LIBHWLOC_LIBRARY_DIRS ${hwloc_targ_BINARY_DIR}/lib)
370369
set(LIBHWLOC_INCLUDE_DIRS ${hwloc_targ_BINARY_DIR}/include)
371370
set(LIBHWLOC_LIBRARIES ${hwloc_targ_BINARY_DIR}/lib/libhwloc.a)
371+
set(LIBHWLOC_FOUND TRUE)
372372
endif()
373373
endif() # UMF_LINK_HWLOC_STATICALLY
374374

@@ -444,7 +444,7 @@ if(UMF_BUILD_LEVEL_ZERO_PROVIDER)
444444
endif()
445445
message(STATUS "LEVEL_ZERO_INCLUDE_DIRS = ${LEVEL_ZERO_INCLUDE_DIRS}")
446446

447-
if(ZE_LOADER_LIBRARIES)
447+
if(ZE_LOADER_FOUND)
448448
set(UMF_LEVEL_ZERO_ENABLED TRUE)
449449
else()
450450
message(
@@ -500,7 +500,7 @@ if(UMF_BUILD_CUDA_PROVIDER)
500500
endif()
501501
message(STATUS "CUDA_INCLUDE_DIRS = ${CUDA_INCLUDE_DIRS}")
502502

503-
if(CUDA_LIBRARIES)
503+
if(CUDA_FOUND)
504504
set(UMF_CUDA_ENABLED TRUE)
505505
else()
506506
message(
@@ -722,7 +722,7 @@ pkg_check_modules(TBB tbb)
722722
if(NOT TBB_FOUND)
723723
find_package(TBB OPTIONAL_COMPONENTS tbb)
724724
endif()
725-
if(TBB_FOUND OR TBB_LIBRARY_DIRS)
725+
if(TBB_FOUND)
726726
# add PATH to DLL on Windows
727727
set(DLL_PATH_LIST "${DLL_PATH_LIST};PATH=path_list_append:${TBB_DLL_DIRS}")
728728
set(UMF_POOL_SCALABLE_ENABLED TRUE)

test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ if(LINUX
674674
)
675675
endif()
676676

677-
if(LIBNUMA_LIBRARIES)
677+
if(LIBNUMA_FOUND)
678678
set(EXAMPLES ${EXAMPLES} memspace_hmat memspace_numa)
679679
else()
680680
message(

0 commit comments

Comments
 (0)