Revert "move find_package(OpenMP) from SuiteSparse_config/CMakeLists.…

…txt to SuiteSparsePolicy.cmake" This reverts commit d055b94.
DrTimothyAldenDavis · Dec 20, 2023 · 6edc720 · 6edc720
1 parent d055b94
commit 6edc720
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 39 deletions.
diff --git a/GraphBLAS/cmake_modules/SuiteSparsePolicy.cmake b/GraphBLAS/cmake_modules/SuiteSparsePolicy.cmake
@@ -254,19 +254,6 @@ else ( )
         CACHE STRING "C to Fortan name mangling" )
 endif ( )
 
-#-------------------------------------------------------------------------------
-# find OpenMP
-#-------------------------------------------------------------------------------
-
-option ( SUITESPARSE_USE_OPENMP "ON (default): Use OpenMP if available.  OFF: Do not use OpenMP" ON )
-if ( SUITESPARSE_USE_OPENMP )
-    find_package ( OpenMP )
-else ( )
-    # OpenMP has been disabled
-    message ( STATUS "OpenMP disabled" )
-    set ( OpenMP_C_FOUND OFF )
-endif ( )
-
 #-------------------------------------------------------------------------------
 # find CUDA
 #-------------------------------------------------------------------------------

diff --git a/LAGraph/cmake_modules/SuiteSparsePolicy.cmake b/LAGraph/cmake_modules/SuiteSparsePolicy.cmake
@@ -254,19 +254,6 @@ else ( )
         CACHE STRING "C to Fortan name mangling" )
 endif ( )
 
-#-------------------------------------------------------------------------------
-# find OpenMP
-#-------------------------------------------------------------------------------
-
-option ( SUITESPARSE_USE_OPENMP "ON (default): Use OpenMP if available.  OFF: Do not use OpenMP" ON )
-if ( SUITESPARSE_USE_OPENMP )
-    find_package ( OpenMP )
-else ( )
-    # OpenMP has been disabled
-    message ( STATUS "OpenMP disabled" )
-    set ( OpenMP_C_FOUND OFF )
-endif ( )
-
 #-------------------------------------------------------------------------------
 # find CUDA
 #-------------------------------------------------------------------------------

diff --git a/SuiteSparse_config/CMakeLists.txt b/SuiteSparse_config/CMakeLists.txt
@@ -57,6 +57,15 @@ endif ( )
 # find library dependencies
 #-------------------------------------------------------------------------------
 
+option ( SUITESPARSE_USE_OPENMP "ON (default): Use OpenMP if available.  OFF: Do not use OpenMP" ON )
+if ( SUITESPARSE_USE_OPENMP )
+    find_package ( OpenMP )
+else ( )
+    # OpenMP has been disabled
+    message ( STATUS "OpenMP disabled" )
+    set ( OpenMP_C_FOUND OFF )
+endif ( )
+
 include ( SuiteSparseBLAS )
 
 #-------------------------------------------------------------------------------

diff --git a/SuiteSparse_config/cmake_modules/SuiteSparsePolicy.cmake b/SuiteSparse_config/cmake_modules/SuiteSparsePolicy.cmake
@@ -254,19 +254,6 @@ else ( )
         CACHE STRING "C to Fortan name mangling" )
 endif ( )
 
-#-------------------------------------------------------------------------------
-# find OpenMP
-#-------------------------------------------------------------------------------
-
-option ( SUITESPARSE_USE_OPENMP "ON (default): Use OpenMP if available.  OFF: Do not use OpenMP" ON )
-if ( SUITESPARSE_USE_OPENMP )
-    find_package ( OpenMP )
-else ( )
-    # OpenMP has been disabled
-    message ( STATUS "OpenMP disabled" )
-    set ( OpenMP_C_FOUND OFF )
-endif ( )
-
 #-------------------------------------------------------------------------------
 # find CUDA
 #-------------------------------------------------------------------------------