Skip to content

Commit 8355a4b

Browse files
DrTimothyAldenDavisDrTimothyAldenDavis
committed
cmake revisions
1 parent 060fc27 commit 8355a4b

File tree

93 files changed

+1756
-332
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+1756
-332
lines changed

‎AMD/CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ message ( STATUS "Building AMD version: v"
2828

2929
set ( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
3030
${CMAKE_SOURCE_DIR}/cmake_modules
31-
${CMAKE_SOURCE_DIR}/../SuiteSparse_config/cmake_modules
32-
${CMAKE_SOURCE_DIR}/../SuiteSparse/SuiteSparse_config/cmake_modules
33-
)
31+
${CMAKE_SOURCE_DIR}/../SuiteSparse_config/cmake_modules )
3432

3533
include ( SuiteSparsePolicy )
3634

@@ -118,6 +116,9 @@ if ( GLOBAL_INSTALL )
118116
install ( TARGETS amd
119117
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
120118
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} )
119+
install ( FILES ${CMAKE_SOURCE_DIR}/cmake_modules/FindAMD.cmake
120+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/SuiteSparse
121+
COMPONENT Development )
121122
if ( NOT NSTATIC )
122123
install ( TARGETS amd_static
123124
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} )
@@ -132,6 +133,9 @@ if ( INSIDE_SUITESPARSE )
132133
install ( TARGETS amd
133134
LIBRARY DESTINATION ${SUITESPARSE_LIBDIR}
134135
PUBLIC_HEADER DESTINATION ${SUITESPARSE_INCLUDEDIR} )
136+
install ( FILES ${CMAKE_SOURCE_DIR}/cmake_modules/FindAMD.cmake
137+
DESTINATION ${SUITESPARSE_LIBDIR}/cmake/SuiteSparse
138+
COMPONENT Development )
135139
if ( NOT NSTATIC )
136140
install ( TARGETS amd_static
137141
ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} )

‎AMD/Doc/AMD_UserGuide.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ \section{Installation}
675675
To run the demos
676676

677677
\begin{verbatim}
678-
make demo
678+
make demos
679679
\end{verbatim}
680680

681681
To remove all files in \verb'AMD/' not in the original distribution (leaves

‎AMD/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ debug:
5555

5656
all: library
5757

58-
demo: library
58+
demos: library
5959
( cd build && cmake $(CMAKE_OPTIONS) -DDEMO=1 .. && $(MAKE) --jobs=${JOBS} )
6060
./build/amd_demo > build/amd_demo.out
6161
- diff Demo/amd_demo.out build/amd_demo.out

‎AMD/README.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Quick start (Linux or MacOSX):
2323

2424
To run the demos
2525

26-
make demo
26+
make demos
2727

2828
Quick start (for MATLAB users);
2929

‎SuiteSparse_config/cmake_modules/FindAMD.cmake renamed to ‎AMD/cmake_modules/FindAMD.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,12 @@ find_library ( AMD_LIBRARY
5050
)
5151

5252
# get version of the library
53-
get_filename_component (AMD_LIBRARY ${AMD_LIBRARY} REALPATH)
53+
get_filename_component ( AMD_LIBRARY ${AMD_LIBRARY} REALPATH )
54+
get_filename_component ( AMD_FILENAME ${AMD_LIBRARY} NAME )
5455
string (
5556
REGEX MATCH "[0-9]+.[0-9]+.[0-9]+"
5657
AMD_VERSION
57-
${AMD_LIBRARY}
58+
${AMD_FILENAME}
5859
)
5960
set (AMD_LIBRARIES ${AMD_LIBRARY})
6061

‎BTF/CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ message ( STATUS "Building BTF version: v"
2828

2929
set ( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
3030
${CMAKE_SOURCE_DIR}/cmake_modules
31-
${CMAKE_SOURCE_DIR}/../SuiteSparse_config/cmake_modules
32-
${CMAKE_SOURCE_DIR}/../SuiteSparse/SuiteSparse_config/cmake_modules
33-
)
31+
${CMAKE_SOURCE_DIR}/../SuiteSparse_config/cmake_modules )
3432

3533
include ( SuiteSparsePolicy )
3634

@@ -117,6 +115,9 @@ if ( GLOBAL_INSTALL )
117115
install ( TARGETS btf
118116
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
119117
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} )
118+
install ( FILES ${CMAKE_SOURCE_DIR}/cmake_modules/FindBTF.cmake
119+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/SuiteSparse
120+
COMPONENT Development )
120121
if ( NOT NSTATIC )
121122
install ( TARGETS btf_static
122123
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} )
@@ -131,6 +132,9 @@ if ( INSIDE_SUITESPARSE )
131132
install ( TARGETS btf
132133
LIBRARY DESTINATION ${SUITESPARSE_LIBDIR}
133134
PUBLIC_HEADER DESTINATION ${SUITESPARSE_INCLUDEDIR} )
135+
install ( FILES ${CMAKE_SOURCE_DIR}/cmake_modules/FindBTF.cmake
136+
DESTINATION ${SUITESPARSE_LIBDIR}/cmake/SuiteSparse
137+
COMPONENT Development )
134138
if ( NOT NSTATIC )
135139
install ( TARGETS btf_static
136140
ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} )

‎BTF/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ debug:
5656
all: library
5757

5858
# there is no BTF demo
59-
demo: library
59+
demos: library
6060

6161
# just compile after running cmake; do not run cmake again
6262
remake:

‎SuiteSparse_config/cmake_modules/FindBTF.cmake renamed to ‎BTF/cmake_modules/FindBTF.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,12 @@ find_library ( BTF_LIBRARY
5050
)
5151

5252
# get version of the library
53-
get_filename_component (BTF_LIBRARY ${BTF_LIBRARY} REALPATH)
53+
get_filename_component ( BTF_LIBRARY ${BTF_LIBRARY} REALPATH )
54+
get_filename_component ( BTF_FILENAME ${BTF_LIBRARY} NAME )
5455
string (
5556
REGEX MATCH "[0-9]+.[0-9]+.[0-9]+"
5657
BTF_VERSION
57-
${BTF_LIBRARY}
58+
${BTF_FILENAME}
5859
)
5960
set (BTF_LIBRARIES ${BTF_LIBRARY})
6061

‎CAMD/CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ message ( STATUS "Building CAMD version: v"
2727

2828
set ( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
2929
${CMAKE_SOURCE_DIR}/cmake_modules
30-
${CMAKE_SOURCE_DIR}/../SuiteSparse_config/cmake_modules
31-
${CMAKE_SOURCE_DIR}/../SuiteSparse/SuiteSparse_config/cmake_modules
32-
)
30+
${CMAKE_SOURCE_DIR}/../SuiteSparse_config/cmake_modules )
3331

3432
include ( SuiteSparsePolicy )
3533

@@ -116,6 +114,9 @@ if ( GLOBAL_INSTALL )
116114
install ( TARGETS camd
117115
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
118116
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} )
117+
install ( FILES ${CMAKE_SOURCE_DIR}/cmake_modules/FindCAMD.cmake
118+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/SuiteSparse
119+
COMPONENT Development )
119120
if ( NOT NSTATIC )
120121
install ( TARGETS camd_static
121122
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} )
@@ -130,6 +131,9 @@ if ( INSIDE_SUITESPARSE )
130131
install ( TARGETS camd
131132
LIBRARY DESTINATION ${SUITESPARSE_LIBDIR}
132133
PUBLIC_HEADER DESTINATION ${SUITESPARSE_INCLUDEDIR} )
134+
install ( FILES ${CMAKE_SOURCE_DIR}/cmake_modules/FindCAMD.cmake
135+
DESTINATION ${SUITESPARSE_LIBDIR}/cmake/SuiteSparse
136+
COMPONENT Development )
133137
if ( NOT NSTATIC )
134138
install ( TARGETS camd_static
135139
ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} )

‎CAMD/Doc/CAMD_UserGuide.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ \section{Installation}
524524
To run the demos
525525

526526
\begin{verbatim}
527-
make demo
527+
make demos
528528
\end{verbatim}
529529

530530
To remove all files in \verb'CAMD/' not in the original distribution (leaves

‎CAMD/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ debug:
5555

5656
all: library
5757

58-
demo: library
58+
demos: librarys
5959
( cd build && cmake $(CMAKE_OPTIONS) -DDEMO=1 .. && $(MAKE) --jobs=${JOBS} )
6060
./build/camd_demo > build/camd_demo.out
6161
- diff Demo/camd_demo.out build/camd_demo.out

‎CAMD/README.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Quick start (Linux or MacOSX):
2323

2424
To run the demos
2525

26-
make demo
26+
make demos
2727

2828
Quick start (for MATLAB users);
2929

‎SuiteSparse_config/cmake_modules/FindCAMD.cmake renamed to ‎CAMD/cmake_modules/FindCAMD.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,12 @@ find_library ( CAMD_LIBRARY
5050
)
5151

5252
# get version of the library
53-
get_filename_component (CAMD_LIBRARY ${CAMD_LIBRARY} REALPATH)
53+
get_filename_component ( CAMD_LIBRARY ${CAMD_LIBRARY} REALPATH )
54+
get_filename_component ( CAMD_FILENAME ${CAMD_LIBRARY} NAME )
5455
string (
5556
REGEX MATCH "[0-9]+.[0-9]+.[0-9]+"
5657
CAMD_VERSION
57-
${CAMD_LIBRARY}
58+
${CAMD_FILENAME}
5859
)
5960
set (CAMD_LIBRARIES ${CAMD_LIBRARY})
6061

‎CCOLAMD/CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ message ( STATUS "Building CCOLAMD version: v"
2727

2828
set ( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
2929
${CMAKE_SOURCE_DIR}/cmake_modules
30-
${CMAKE_SOURCE_DIR}/../SuiteSparse_config/cmake_modules
31-
${CMAKE_SOURCE_DIR}/../SuiteSparse/SuiteSparse_config/cmake_modules
32-
)
30+
${CMAKE_SOURCE_DIR}/../SuiteSparse_config/cmake_modules )
3331

3432
include ( SuiteSparsePolicy )
3533

@@ -116,6 +114,9 @@ if ( GLOBAL_INSTALL )
116114
install ( TARGETS ccolamd
117115
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
118116
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} )
117+
install ( FILES ${CMAKE_SOURCE_DIR}/cmake_modules/FindCCOLAMD.cmake
118+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/SuiteSparse
119+
COMPONENT Development )
119120
if ( NOT NSTATIC )
120121
install ( TARGETS ccolamd_static
121122
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} )
@@ -130,6 +131,9 @@ if ( INSIDE_SUITESPARSE )
130131
install ( TARGETS ccolamd
131132
LIBRARY DESTINATION ${SUITESPARSE_LIBDIR}
132133
PUBLIC_HEADER DESTINATION ${SUITESPARSE_INCLUDEDIR} )
134+
install ( FILES ${CMAKE_SOURCE_DIR}/cmake_modules/FindCCOLAMD.cmake
135+
DESTINATION ${SUITESPARSE_LIBDIR}/cmake/SuiteSparse
136+
COMPONENT Development )
133137
if ( NOT NSTATIC )
134138
install ( TARGETS ccolamd_static
135139
ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} )

‎CCOLAMD/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ debug:
5555

5656
all: library
5757

58-
demo: library
58+
demos: library
5959
( cd build ; cmake $(CMAKE_OPTIONS) -DDEMO=1 .. ; $(MAKE) --jobs=${JOBS} )
6060
- ./build/ccolamd_example > ./build/ccolamd_example.out
6161
- diff ./Demo/ccolamd_example.out ./build/ccolamd_example.out

‎CCOLAMD/README.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Visual Studio.
3535
"make install" will install in /usr/local/lib,
3636
/usr/local/include, SuiteSparse/lib, and
3737
SuiteSparse/include
38-
make demo compiles and runs a few demos
38+
make demos compiles and runs a few demos
3939
make library compiles a C-callable library containing colamd
4040
make clean removes all files not in the distribution,
4141
but keeps the compiled libraries.

‎SuiteSparse_config/cmake_modules/FindCCOLAMD.cmake renamed to ‎CCOLAMD/cmake_modules/FindCCOLAMD.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,12 @@ find_library ( CCOLAMD_LIBRARY
5050
)
5151

5252
# get version of the library
53-
get_filename_component (CCOLAMD_LIBRARY ${CCOLAMD_LIBRARY} REALPATH)
53+
get_filename_component ( CCOLAMD_LIBRARY ${CCOLAMD_LIBRARY} REALPATH )
54+
get_filename_component ( CCOLAMD_FILENAME ${CCOLAMD_LIBRARY} NAME )
5455
string (
5556
REGEX MATCH "[0-9]+.[0-9]+.[0-9]+"
5657
CCOLAMD_VERSION
57-
${CCOLAMD_LIBRARY}
58+
${CCOLAMD_FILENAME}
5859
)
5960
set (CCOLAMD_LIBRARIES ${CCOLAMD_LIBRARY})
6061

‎CHOLMOD/CMakeLists.txt

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,12 @@ message ( STATUS "Building CHOLMOD version: v"
2828

2929
set ( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
3030
${CMAKE_SOURCE_DIR}/cmake_modules
31-
${CMAKE_SOURCE_DIR}/../SuiteSparse_config/cmake_modules
32-
${CMAKE_SOURCE_DIR}/../SuiteSparse/SuiteSparse_config/cmake_modules
33-
)
31+
${CMAKE_SOURCE_DIR}/../COLAMD/cmake_modules
32+
${CMAKE_SOURCE_DIR}/../AMD/cmake_modules
33+
${CMAKE_SOURCE_DIR}/../CAMD/cmake_modules
34+
${CMAKE_SOURCE_DIR}/../CCOLAMD/cmake_modules
35+
${CMAKE_SOURCE_DIR}/../SuiteSparse_metis/cmake_modules
36+
${CMAKE_SOURCE_DIR}/../SuiteSparse_config/cmake_modules )
3437

3538
if ( NOT DEFINED ENABLE_CUDA )
3639
# default is to use CUDA, if available
@@ -245,7 +248,7 @@ endif ( )
245248

246249
#-------------------------------------------------------------------------------
247250
# CHOLMOD installation location
248-
#---------------------------------------------------------------Z--------------
251+
#-------------------------------------------------------------------------------
249252

250253
if ( GLOBAL_INSTALL )
251254
# install in /usr/local/lib and /usr/local/include.
@@ -254,6 +257,12 @@ if ( GLOBAL_INSTALL )
254257
install ( TARGETS cholmod
255258
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
256259
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} )
260+
file ( GLOB ${CMAKE_MODULES} "cmake_modules/FindCHOLMOD*.cmake" )
261+
install ( FILES
262+
cmake_modules/FindCHOLMOD.cmake
263+
cmake_modules/FindCHOLMOD_CUDA.cmake
264+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/SuiteSparse
265+
COMPONENT Development )
257266
if ( NOT NSTATIC )
258267
install ( TARGETS cholmod_static
259268
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} )
@@ -268,6 +277,11 @@ if ( INSIDE_SUITESPARSE )
268277
install ( TARGETS cholmod
269278
LIBRARY DESTINATION ${SUITESPARSE_LIBDIR}
270279
PUBLIC_HEADER DESTINATION ${SUITESPARSE_INCLUDEDIR} )
280+
install ( FILES
281+
cmake_modules/FindCHOLMOD.cmake
282+
cmake_modules/FindCHOLMOD_CUDA.cmake
283+
DESTINATION ${SUITESPARSE_LIBDIR}/cmake/SuiteSparse
284+
COMPONENT Development )
271285
if ( NOT NSTATIC )
272286
install ( TARGETS cholmod_static
273287
ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} )

‎CHOLMOD/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ debug:
6666

6767
all: library
6868

69-
demo: library
69+
demos: library
7070
( cd build && cmake $(CMAKE_OPTIONS) -DDEMO=1 .. && $(MAKE) --jobs=${JOBS} )
7171
./build/cholmod_demo < ./Demo/Matrix/bcsstk01.tri
7272
./build/cholmod_l_demo < ./Demo/Matrix/bcsstk01.tri

0 commit comments

Comments
 (0)