diff --git a/CMakeLists.txt b/CMakeLists.txt index 89205b9be2..c62160797c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,10 +39,10 @@ cmake_minimum_required ( VERSION 3.20 ) # LAGraph can be built stand-alone # version of LAGraph -set ( LAGraph_DATE "Jan 10, 2024" ) +set ( LAGraph_DATE "Jan 20, 2024" ) set ( LAGraph_VERSION_MAJOR 1 CACHE STRING "" FORCE ) set ( LAGraph_VERSION_MINOR 1 CACHE STRING "" FORCE ) -set ( LAGraph_VERSION_SUB 1 CACHE STRING "" FORCE ) +set ( LAGraph_VERSION_SUB 2 CACHE STRING "" FORCE ) message ( STATUS "Building LAGraph version: v" ${LAGraph_VERSION_MAJOR}. @@ -162,9 +162,6 @@ endif ( ) #------------------------------------------------------------------------------- option ( LAGRAPH_USE_OPENMP "ON: Use OpenMP in LAGraph if available. OFF: Do not use OpenMP. (Default: SUITESPARSE_USE_OPENMP)" ${SUITESPARSE_USE_OPENMP} ) -if ( NOT SUITESPARSE_USE_OPENMP ) - set ( LAGRAPH_USE_OPENMP "OFF" CACHE STRING "" FORCE ) -endif ( ) if ( COVERAGE ) set ( LAGRAPH_USE_OPENMP "OFF" CACHE STRING "" FORCE ) # OK: test coverage is enabled message ( STATUS "OpenMP disabled for test coverage" ) @@ -184,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 ) diff --git a/ChangeLog b/ChangeLog index a662270958..f7a0f454a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Jan 20, 2024: version 1.1.2 + + * minor update to build system + Jan 10, 2024: version 1.1.1 * minor update to build system diff --git a/Makefile b/Makefile index 2f91ff5fc4..dcbd44ac9e 100644 --- a/Makefile +++ b/Makefile @@ -85,10 +85,10 @@ remake: # just run cmake to set things up setup: - ( cd build ; cmake $(CMAKE_OPTIONS) .. ) + ( cd build && cmake $(CMAKE_OPTIONS) .. ) install: - ( cd build ; cmake --install . ) + ( cd build && cmake --install . ) # remove any installed libraries and #include files uninstall: diff --git a/cmake_modules/SuiteSparsePolicy.cmake b/cmake_modules/SuiteSparsePolicy.cmake index 20a7fcf784..b6b195407c 100644 --- a/cmake_modules/SuiteSparsePolicy.cmake +++ b/cmake_modules/SuiteSparsePolicy.cmake @@ -107,6 +107,16 @@ if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.18.0" ) cmake_policy ( SET CMP0104 NEW ) # initialize CUDA architectures endif ( ) +# SuiteSparse packages have many intentional extra semicolons, for code +# readability (such as "/* do nothing */ ;" in SuiteSparse_config.c). Disable +# the clang warning for these statements: +if ( CMAKE_C_COMPILER_ID STREQUAL "Clang" ) + set ( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wno-extra-semi-stmt" ) +endif ( ) +if ( CMAKE_CXX_COMPILER_ID STREQUAL "Clang" ) + set ( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wno-extra-semi-stmt" ) +endif ( ) + if ( WIN32 ) set ( CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS true ) add_compile_definitions ( _CRT_SECURE_NO_WARNINGS ) @@ -120,7 +130,7 @@ set ( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake_modules ) # Use OpenMP -option ( SUITESPARSE_USE_OPENMP "ON (default): Use OpenMP if available. OFF: Do not use OpenMP" ON ) +option ( SUITESPARSE_USE_OPENMP "ON (default): Use OpenMP in libraries by default if available. OFF: Do not use OpenMP by default." ON ) # strict usage option ( SUITESPARSE_USE_STRICT "ON: treat all _USE__ settings as strict if they are ON. OFF (default): consider *_USE_* as preferences, not strict" OFF ) diff --git a/experimental/CMakeLists.txt b/experimental/CMakeLists.txt index 6038808bfc..2caaa1c6d9 100644 --- a/experimental/CMakeLists.txt +++ b/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 ( ) diff --git a/experimental/test/CMakeLists.txt b/experimental/test/CMakeLists.txt index 51f99f0987..3f72d74b9e 100644 --- a/experimental/test/CMakeLists.txt +++ b/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 ( ) diff --git a/include/LAGraph.h b/include/LAGraph.h index 5834117633..6eed809cb9 100644 --- a/include/LAGraph.h +++ b/include/LAGraph.h @@ -37,10 +37,10 @@ // See also the LAGraph_Version utility method, which returns these values. // These definitions are derived from LAGraph/CMakeLists.txt. -#define LAGRAPH_DATE "Jan 10, 2024" +#define LAGRAPH_DATE "Jan 20, 2024" #define LAGRAPH_VERSION_MAJOR 1 #define LAGRAPH_VERSION_MINOR 1 -#define LAGRAPH_VERSION_UPDATE 1 +#define LAGRAPH_VERSION_UPDATE 2 //============================================================================== // include files and helper macros diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cb7b19aa4f..09177c73ee 100644 --- a/src/CMakeLists.txt +++ b/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 ( ) diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 025b1b35ab..37e56418ae 100644 --- a/src/test/CMakeLists.txt +++ b/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 ( )