Skip to content

Commit ea7dcb3

Browse files
committed
cmake: use <package>_FOUND instead of WITH_<package>
WITH_<package> can be true while <package> was not found.
1 parent a62e253 commit ea7dcb3

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

CMakeLists.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ if (WITH_CHOLMOD)
340340
#CHOLMOD/Supernodal/t_cholmod_super_solve.c
341341
)
342342

343-
if (NOT WITH_METIS)
343+
if (NOT METIS_FOUND)
344344
set_property (SOURCE
345345
CHOLMOD/Check/cholmod_check.c
346346
CHOLMOD/Partition/cholmod_camd.c
@@ -350,7 +350,7 @@ if (WITH_CHOLMOD)
350350
CHOLMOD/Partition/cholmod_metis.c
351351
CHOLMOD/Partition/cholmod_nesdis.c
352352
APPEND PROPERTY COMPILE_DEFINITIONS NPARTITION)
353-
endif (NOT WITH_METIS)
353+
endif (NOT METIS_FOUND)
354354

355355
configure_file (CHOLMOD/Include/cholmod_config.h.cmake.in
356356
${CMAKE_CURRENT_BINARY_DIR}/CHOLMOD/Include/cholmod_config.h)
@@ -707,7 +707,7 @@ if (WITH_CHOLMOD)
707707
${CHOLMOD_HDRS}
708708
)
709709

710-
if (WITH_METIS)
710+
if (METIS_FOUND)
711711
set (_METIS_IN ${SuiteSparse_SOURCE_DIR}/cmake/FindMETIS.cmake)
712712
set (_METIS_OUT ${SuiteSparse_BINARY_DIR}/FindMETIS.cmake)
713713

@@ -719,7 +719,7 @@ if (WITH_CHOLMOD)
719719
)
720720

721721
target_sources (cholmod PRIVATE ${_METIS_OUT})
722-
endif (WITH_METIS)
722+
endif (METIS_FOUND)
723723

724724
add_library (SuiteSparse::CHOLMOD ALIAS cholmod)
725725

@@ -738,15 +738,15 @@ if (WITH_CHOLMOD)
738738
target_compile_definitions (cholmod PRIVATE _GNU_SOURCE)
739739
endif (HAVE_FEENABLEEXCEPT)
740740

741-
if (WITH_METIS AND METIS_FOUND)
741+
if (METIS_FOUND)
742742
target_link_libraries (cholmod PRIVATE METIS::METIS)
743743

744744
add_library (cholmod_partition INTERFACE)
745745
add_library (SuiteSparse::Partition ALIAS cholmod_partition)
746746
target_link_libraries (cholmod_partition INTERFACE cholmod)
747747

748748
set (METIS_DEPENDENCY "find_dependency (METIS ${METIS_VERSION})")
749-
endif (WITH_METIS AND METIS_FOUND)
749+
endif (METIS_FOUND)
750750

751751
target_link_libraries (cholmod
752752
PRIVATE BLAS::BLAS
@@ -855,12 +855,12 @@ if (WITH_SUPERNODAL)
855855
target_link_libraries (spqr PRIVATE SuiteSparse::GPURuntime)
856856
endif (WITH_CUDA AND CMAKE_CUDA_COMPILER_LOADED)
857857

858-
if (WITH_TBB AND TBB_FOUND)
858+
if (TBB_FOUND)
859859
target_link_libraries (spqr PRIVATE TBB::tbb)
860860
target_compile_definitions (spqr PRIVATE HAVE_TBB)
861861

862862
set (TBB_DEPENDENCY "find_dependency (TBB ${TBB_VERSION})")
863-
endif (WITH_TBB AND TBB_FOUND)
863+
endif (TBB_FOUND)
864864
endif (WITH_SUPERNODAL)
865865

866866
add_library (suitesparseconfig
@@ -1780,7 +1780,7 @@ add_feature_info (Check WITH_CHECK "Check module")
17801780
add_feature_info (Cholesky WITH_CHOLESKY "Cholesky module")
17811781
add_feature_info (Fortran WITH_FORTRAN "Fortran compilation")
17821782
add_feature_info (MatrixOps WITH_MATRIXOPS "MatrixOps module")
1783-
add_feature_info (Partition "WITH_METIS" "Partition module")
1783+
add_feature_info (Partition WITH_METIS "Partition module")
17841784
add_feature_info (Print WITH_PRINT "Additional diagnostic messages")
17851785
add_feature_info (Supernodal WITH_SUPERNODAL "Supernodal module")
17861786
add_feature_info (Threading WITH_TBB "Parallelization using Intel Threading Building Blocks")

0 commit comments

Comments
 (0)