Skip to content

Commit 9439bda

Browse files
SUITESPARSE_USE_OPENMP option moved to SuiteSparsePolicy.cmake
1 parent c50b66d commit 9439bda

File tree

9 files changed

+9
-6
lines changed

9 files changed

+9
-6
lines changed

CHOLMOD/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ endif ( )
7979
# find OpenMP
8080
#-------------------------------------------------------------------------------
8181

82-
option ( SUITESPARSE_USE_OPENMP "ON (default): Use OpenMP if available. OFF: Do not use OpenMP" ON )
8382
option ( CHOLMOD_USE_OPENMP "ON: Use OpenMP in CHOLMOD if available. OFF: Do not use OpenMP. (Default: SUITESPARSE_USE_OPENMP)" ${SUITESPARSE_USE_OPENMP} )
8483
if ( CHOLMOD_USE_OPENMP )
8584
find_package ( OpenMP GLOBAL )

GraphBLAS/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ endif ( )
9595
# find OpenMP
9696
#-------------------------------------------------------------------------------
9797

98-
option ( SUITESPARSE_USE_OPENMP "ON (default): Use OpenMP if available. OFF: Do not use OpenMP" ON )
9998
option ( GRAPHBLAS_USE_OPENMP "ON: Use OpenMP in GraphBLAS if available. OFF: Do not use OpenMP. (Default: SUITESPARSE_USE_OPENMP)" ${SUITESPARSE_USE_OPENMP} )
10099
if ( GRAPHBLAS_USE_OPENMP )
101100
find_package ( OpenMP GLOBAL )

GraphBLAS/GraphBLAS/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ project ( graphblas_matlab
5656
# find OpenMP
5757
#-------------------------------------------------------------------------------
5858

59-
option ( SUITESPARSE_USE_OPENMP "ON (default): Use OpenMP if available. OFF: Do not use OpenMP" ON )
6059
option ( GRAPHBLAS_USE_OPENMP "ON: Use OpenMP in GraphBLAS if available. OFF: Do not use OpenMP. (Default: SUITESPARSE_USE_OPENMP)" ${SUITESPARSE_USE_OPENMP} )
6160
if ( GRAPHBLAS_USE_OPENMP )
6261
find_package ( OpenMP )

GraphBLAS/cmake_modules/SuiteSparsePolicy.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,9 @@ include ( GNUInstallDirs )
121121
set ( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
122122
${CMAKE_SOURCE_DIR}/cmake_modules )
123123

124+
# Use OpenMP
125+
option ( SUITESPARSE_USE_OPENMP "ON (default): Use OpenMP if available. OFF: Do not use OpenMP" ON )
126+
124127
# strict usage
125128
option ( SUITESPARSE_USE_STRICT "ON: treat all _USE__ settings as strict if they are ON. OFF (default): consider *_USE_* as preferences, not strict" OFF )
126129

LAGraph/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ endif ( )
155155
# determine what user threading model to use
156156
#-------------------------------------------------------------------------------
157157

158-
option ( SUITESPARSE_USE_OPENMP "ON (default): Use OpenMP if available. OFF: Do not use OpenMP" ON )
159158
option ( LAGRAPH_USE_OPENMP "ON: Use OpenMP in LAGraph if available. OFF: Do not use OpenMP. (Default: SUITESPARSE_USE_OPENMP)" ${SUITESPARSE_USE_OPENMP} )
160159
if ( COVERAGE )
161160
set ( LAGRAPH_USE_OPENMP OFF ) # OK: test coverage is enabled

LAGraph/cmake_modules/SuiteSparsePolicy.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,9 @@ include ( GNUInstallDirs )
121121
set ( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
122122
${CMAKE_SOURCE_DIR}/cmake_modules )
123123

124+
# Use OpenMP
125+
option ( SUITESPARSE_USE_OPENMP "ON (default): Use OpenMP if available. OFF: Do not use OpenMP" ON )
126+
124127
# strict usage
125128
option ( SUITESPARSE_USE_STRICT "ON: treat all _USE__ settings as strict if they are ON. OFF (default): consider *_USE_* as preferences, not strict" OFF )
126129

ParU/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ endif ( )
5454
# find OpenMP
5555
#-------------------------------------------------------------------------------
5656

57-
option ( SUITESPARSE_USE_OPENMP "ON (default): Use OpenMP if available. OFF: Do not use OpenMP" ON )
5857
option ( PARU_USE_OPENMP "ON: Use OpenMP in ParU if available. OFF: Do not use OpenMP. (Default: SUITESPARSE_USE_OPENMP)" ${SUITESPARSE_USE_OPENMP} )
5958

6059
if ( PARU_USE_OPENMP )

SuiteSparse_config/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ endif ( )
5757
# find OpenMP
5858
#-------------------------------------------------------------------------------
5959

60-
option ( SUITESPARSE_USE_OPENMP "ON (default): Use OpenMP if available. OFF: Do not use OpenMP" ON )
6160
if ( SUITESPARSE_USE_OPENMP )
6261
find_package ( OpenMP GLOBAL )
6362
else ( )

SuiteSparse_config/cmake_modules/SuiteSparsePolicy.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,9 @@ include ( GNUInstallDirs )
121121
set ( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
122122
${CMAKE_SOURCE_DIR}/cmake_modules )
123123

124+
# Use OpenMP
125+
option ( SUITESPARSE_USE_OPENMP "ON (default): Use OpenMP if available. OFF: Do not use OpenMP" ON )
126+
124127
# strict usage
125128
option ( SUITESPARSE_USE_STRICT "ON: treat all _USE__ settings as strict if they are ON. OFF (default): consider *_USE_* as preferences, not strict" OFF )
126129

0 commit comments

Comments
 (0)