Merge pull request DrTimothyAldenDavis#745 from mmuetzel/cmake

CMake: Try to handle `*_USE_OPENMP` more consistently.

Author: DrTimothyAldenDavis

CHOLMOD/CMakeLists.txt

@@ -95,7 +95,7 @@ else ( )
     set ( OpenMP_C_FOUND OFF )
 endif ( )
 
-if ( OpenMP_C_FOUND )
+if ( CHOLMOD_USE_OPENMP AND OpenMP_C_FOUND )
     set ( CHOLMOD_HAS_OPENMP ON )
 else ( )
     set ( CHOLMOD_HAS_OPENMP OFF )

GraphBLAS/CMakeLists.txt

@@ -109,7 +109,7 @@ else ( )
     set ( OpenMP_C_FOUND OFF )
 endif ( )
 
-if ( OpenMP_C_FOUND )
+if ( GRAPHBLAS_USE_OPENMP AND OpenMP_C_FOUND )
     set ( GRAPHBLAS_HAS_OPENMP ON )
 else ( )
     set ( GRAPHBLAS_HAS_OPENMP OFF )

LAGraph/CMakeLists.txt

@@ -181,7 +181,7 @@ else ( )
     endif ( )
 endif ( )
 
-if ( OpenMP_C_FOUND )
+if ( LAGRAPH_USE_OPENMP AND OpenMP_C_FOUND )
     set ( LAGRAPH_HAS_OPENMP ON )
 else ( )
     set ( LAGRAPH_HAS_OPENMP OFF )

LAGraph/experimental/CMakeLists.txt

@@ -85,7 +85,7 @@ endif ( )
 # add OpenMP
 #-------------------------------------------------------------------------------
 
-if ( OpenMP_C_FOUND )
+if ( LAGRAPH_HAS_OPENMP )
     if ( BUILD_SHARED_LIBS )
         target_link_libraries ( LAGraphX PRIVATE OpenMP::OpenMP_C )
     endif ( )

LAGraph/experimental/test/CMakeLists.txt

@@ -74,7 +74,7 @@ endif ( )
 # add OpenMP
 #-------------------------------------------------------------------------------
 
-if ( OpenMP_C_FOUND )
+if ( LAGRAPH_HAS_OPENMP )
     if ( BUILD_SHARED_LIBS )
         target_link_libraries ( lagraphxtest PRIVATE OpenMP::OpenMP_C )
     endif ( )

LAGraph/src/CMakeLists.txt

@@ -90,7 +90,7 @@ endif ( )
 # add OpenMP
 #-------------------------------------------------------------------------------
 
-if ( OpenMP_C_FOUND )
+if ( LAGRAPH_HAS_OPENMP )
     if ( BUILD_SHARED_LIBS )
         target_link_libraries ( LAGraph PRIVATE OpenMP::OpenMP_C )
     endif ( )

LAGraph/src/test/CMakeLists.txt

@@ -76,7 +76,7 @@ endif ( )
 # add OpenMP
 #-------------------------------------------------------------------------------
 
-if ( OpenMP_C_FOUND )
+if ( LAGRAPH_HAS_OPENMP )
     if ( BUILD_SHARED_LIBS )
         target_link_libraries ( lagraphtest PRIVATE OpenMP::OpenMP_C )
     endif ( )

README.md

@@ -987,9 +987,9 @@ build type).  The static libraries will not be built (since
 
 * `SUITESPARSE_USE_OPENMP`:
 
-  If `ON`, OpenMP is used if it is available.  Default: `OFF`.
+  If `ON`, OpenMP is used by default if it is available.  Default: `ON`.
 
-  GraphBLAS, LAGraph, and ParU will vastly slower if OpenMP is not used.
+  GraphBLAS, LAGraph, and ParU will be vastly slower if OpenMP is not used.
   CHOLMOD will be somewhat slower without OpenMP (as long as it still has a
   parallel BLAS/LAPACK).  Three packages (UMFPACK, CHOLMOD, and SPQR) rely
   heavily on parallel BLAS/LAPACK libraries and those libraries may use OpenMP

SuiteSparse_config/CMakeLists.txt

@@ -71,7 +71,7 @@ endif ( )
 #-------------------------------------------------------------------------------
 
 option ( SUITESPARSE_CONFIG_USE_OPENMP "ON: Use OpenMP in SuiteSparse_config if available.  OFF: Do not use OpenMP.  (Default: SUITESPARSE_USE_OPENMP)" ${SUITESPARSE_USE_OPENMP} )
-if ( SUITESPARSE_CONFIG_USE_OPENMP OR SUITESPARSE_USE_OPENMP )
+if ( SUITESPARSE_CONFIG_USE_OPENMP )
     if ( CMAKE_VERSION VERSION_LESS 3.24 )
         find_package ( OpenMP COMPONENTS C )
     else ( )
@@ -82,20 +82,14 @@ else ( )
     set ( OpenMP_C_FOUND OFF )
 endif ( )
 
-if ( OpenMP_C_FOUND )
-    set ( SUITESPARSE_HAS_OPENMP ON )
+if ( SUITESPARSE_CONFIG_USE_OPENMP AND OpenMP_C_FOUND )
     set ( SUITESPARSE_CONFIG_HAS_OPENMP ON )
 else ( )
-    set ( SUITESPARSE_HAS_OPENMP OFF )
     set ( SUITESPARSE_CONFIG_HAS_OPENMP OFF )
 endif ( )
-message ( STATUS "SuiteSparse has OpenMP:        ${SUITESPARSE_HAS_OPENMP}" )
 message ( STATUS "SuiteSparse_config has OpenMP: ${SUITESPARSE_CONFIG_HAS_OPENMP}" )
 
 # check for strict usage
-if ( SUITESPARSE_USE_STRICT AND SUITESPARSE_USE_OPENMP AND NOT SUITESPARSE_HAS_OPENMP )
-    message ( FATAL_ERROR "OpenMP required for SuiteSparse but not found" )
-endif ( )
 if ( SUITESPARSE_USE_STRICT AND SUITESPARSE_CONFIG_USE_OPENMP AND NOT SUITESPARSE_CONFIG_HAS_OPENMP )
     message ( FATAL_ERROR "OpenMP required for SuiteSparse_config but not found" )
 endif ( )
@@ -212,7 +206,7 @@ if ( NOT NO_LIBM )
 endif ( )
 
 # OpenMP:
-if ( SUITESPARSE_CONFIG_USE_OPENMP )
+if ( SUITESPARSE_CONFIG_HAS_OPENMP )
     message ( STATUS "OpenMP C libraries:      ${OpenMP_C_LIBRARIES} ")
     message ( STATUS "OpenMP C include:        ${OpenMP_C_INCLUDE_DIRS} ")
     message ( STATUS "OpenMP C flags:          ${OpenMP_C_FLAGS} ")

SuiteSparse_config/Config/README.md.in

@@ -987,9 +987,9 @@ build type).  The static libraries will not be built (since
 
 * `SUITESPARSE_USE_OPENMP`:
 
-  If `ON`, OpenMP is used if it is available.  Default: `OFF`.
+  If `ON`, OpenMP is used by default if it is available.  Default: `ON`.
 
-  GraphBLAS, LAGraph, and ParU will vastly slower if OpenMP is not used.
+  GraphBLAS, LAGraph, and ParU will be vastly slower if OpenMP is not used.
   CHOLMOD will be somewhat slower without OpenMP (as long as it still has a
   parallel BLAS/LAPACK).  Three packages (UMFPACK, CHOLMOD, and SPQR) rely
   heavily on parallel BLAS/LAPACK libraries and those libraries may use OpenMP