Skip to content

Commit

Permalink
Revert "lots of diagnostics in UMFPACK/CMakeLists.txt"
Browse files Browse the repository at this point in the history
This reverts commit 4228c25.
  • Loading branch information
mmuetzel committed Dec 2, 2023
1 parent 71daae2 commit dcc1873
Showing 1 changed file with 0 additions and 81 deletions.
81 changes: 0 additions & 81 deletions UMFPACK/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ project ( umfpack
VERSION "${UMFPACK_VERSION_MAJOR}.${UMFPACK_VERSION_MINOR}.${UMFPACK_VERSION_SUB}"
LANGUAGES C )

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "1: ${dirs}" )

#-------------------------------------------------------------------------------
# SuiteSparse policies
#-------------------------------------------------------------------------------
Expand All @@ -49,19 +46,13 @@ include ( SuiteSparsePolicy )
# find library dependencies
#-------------------------------------------------------------------------------

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "3: ${dirs}" )

if ( NOT SUITESPARSE_ROOT_CMAKELISTS )
find_package ( SuiteSparse_config 7.4.0
PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
find_package ( SuiteSparse_config 7.4.0 REQUIRED )
endif ( )

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "4: ${dirs}" )

find_package ( AMD 3.3.0
PATHS ${CMAKE_SOURCE_DIR}/../AMD/build NO_DEFAULT_PATH )
if ( NOT TARGET SuiteSparse::AMD )
Expand All @@ -71,9 +62,6 @@ endif ( )

include ( SuiteSparseBLAS ) # requires cmake 3.22

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "9: ${dirs}" )

option ( NCHOLMOD "ON: do not use CHOLMOD. OFF (default): use CHOLMOD" OFF )

if ( NOT SUITESPARSE_ROOT_CMAKELISTS AND NOT NCHOLMOD )
Expand All @@ -84,9 +72,6 @@ if ( NOT SUITESPARSE_ROOT_CMAKELISTS AND NOT NCHOLMOD )
find_package ( CHOLMOD 5.1.0 )
endif ( )

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "10: ${dirs}" )

if ( NOT CHOLMOD_FOUND )
# CHOLMOD not found so disable it
set ( NCHOLMOD ON )
Expand All @@ -99,9 +84,6 @@ else ( )
message ( STATUS "Using CHOLMOD for addtional pre-ordering options" )
endif ( )

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "11: ${dirs}" )

#-------------------------------------------------------------------------------
# configure files
#-------------------------------------------------------------------------------
Expand All @@ -117,29 +99,17 @@ configure_file ( "Config/umfpack_version.tex.in"
# include directories
#-------------------------------------------------------------------------------

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "12: ${dirs}" )

include_directories ( Source Include )

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "13: ${dirs}" )

#-------------------------------------------------------------------------------
# dynamic umfpack library properties
#-------------------------------------------------------------------------------

file ( GLOB UMFPACK_SOURCES "Source2/*.c" )

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "14: ${dirs}" )

if ( BUILD_SHARED_LIBS )
add_library ( UMFPACK SHARED ${UMFPACK_SOURCES} )

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "15: ${dirs}" )

set_target_properties ( UMFPACK PROPERTIES
VERSION ${UMFPACK_VERSION_MAJOR}.${UMFPACK_VERSION_MINOR}.${UMFPACK_VERSION_SUB}
C_STANDARD 11
Expand All @@ -149,52 +119,34 @@ message ( STATUS "15: ${dirs}" )
PUBLIC_HEADER "Include/umfpack.h"
WINDOWS_EXPORT_ALL_SYMBOLS ON )

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "16: ${dirs}" )

target_include_directories ( UMFPACK
INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Include>
$<INSTALL_INTERFACE:${SUITESPARSE_INCLUDEDIR}> )
endif ( )

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "17: ${dirs}" )

#-------------------------------------------------------------------------------
# static umfpack library properties
#-------------------------------------------------------------------------------

if ( BUILD_STATIC_LIBS )
add_library ( UMFPACK_static STATIC ${UMFPACK_SOURCES} )

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "18: ${dirs}" )

set_target_properties ( UMFPACK_static PROPERTIES
C_STANDARD 11
C_STANDARD_REQUIRED ON
OUTPUT_NAME umfpack
PUBLIC_HEADER "Include/umfpack.h" )

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "19: ${dirs}" )

if ( MSVC )
set_target_properties ( UMFPACK_static PROPERTIES
OUTPUT_NAME umfpack_static )
endif ( )

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "20: ${dirs}" )

target_include_directories ( UMFPACK_static
INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Include>
$<INSTALL_INTERFACE:${SUITESPARSE_INCLUDEDIR}> )
endif ( )

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "21: ${dirs}" )

#-------------------------------------------------------------------------------
# add the library dependencies
#-------------------------------------------------------------------------------
Expand All @@ -213,9 +165,6 @@ if ( BUILD_STATIC_LIBS )
endif ( )
endif ( )

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "22: ${dirs}" )

# AMD:
if ( BUILD_SHARED_LIBS )
target_link_libraries ( UMFPACK PRIVATE SuiteSparse::AMD )
Expand All @@ -230,9 +179,6 @@ if ( BUILD_STATIC_LIBS )
endif ( )
endif ( )

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "23: ${dirs}" )

# CHOLMOD:
if ( NOT NCHOLMOD )
# link with CHOLMOD and its dependencies, both required and optional
Expand All @@ -257,9 +203,6 @@ else ( )
endif ( )
endif ( )

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "25: ${dirs}" )

# libm:
if ( NOT WIN32 )
if ( BUILD_SHARED_LIBS )
Expand All @@ -271,9 +214,6 @@ if ( NOT WIN32 )
endif ( )
endif ( )

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "26: ${dirs}" )

# BLAS:
message ( STATUS "BLAS libraries: ${BLAS_LIBRARIES}" )
message ( STATUS "BLAS include: ${BLAS_INCLUDE_DIRS}" )
Expand All @@ -288,21 +228,12 @@ if ( BUILD_STATIC_LIBS )
target_include_directories ( UMFPACK_static PRIVATE ${BLAS_INCLUDE_DIRS} )
endif ( )

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "27: ${dirs}" )

#-------------------------------------------------------------------------------
# UMFPACK installation location
#-------------------------------------------------------------------------------

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "28: ${dirs}" )

include ( CMakePackageConfigHelpers )

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "29: ${dirs}" )

if ( BUILD_SHARED_LIBS )
install ( TARGETS UMFPACK
EXPORT UMFPACKTargets
Expand Down Expand Up @@ -351,9 +282,6 @@ install ( FILES
${CMAKE_CURRENT_BINARY_DIR}/UMFPACKConfigVersion.cmake
DESTINATION ${SUITESPARSE_PKGFILEDIR}/cmake/UMFPACK )

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "1: ${dirs}" )

#-------------------------------------------------------------------------------
# create pkg-config file
#-------------------------------------------------------------------------------
Expand Down Expand Up @@ -386,9 +314,6 @@ if ( NOT MSVC )
endforeach ( )
endforeach ( )

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "1: ${dirs}" )

set ( prefix "${CMAKE_INSTALL_PREFIX}" )
set ( exec_prefix "\${prefix}" )
cmake_path ( IS_ABSOLUTE SUITESPARSE_LIBDIR SUITESPARSE_LIBDIR_IS_ABSOLUTE )
Expand All @@ -413,9 +338,6 @@ message ( STATUS "1: ${dirs}" )
DESTINATION ${SUITESPARSE_PKGFILEDIR}/pkgconfig )
endif ( )

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "1: ${dirs}" )

#-------------------------------------------------------------------------------
# Demo library and programs
#-------------------------------------------------------------------------------
Expand Down Expand Up @@ -500,9 +422,6 @@ endif ( )
# report status
#-------------------------------------------------------------------------------

get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
message ( STATUS "1: ${dirs}" )

if ( NOT SUITESPARSE_ROOT_CMAKELISTS )
include ( SuiteSparseReport )
endif ( )

0 comments on commit dcc1873

Please sign in to comment.