Skip to content

Commit 629935e

Browse files
committed
Add find_library for suitesparseconfig in FindSPQR.cmake
1 parent 549fdb6 commit 629935e

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 2.8.12)
22
project(msckf_vio)
33

4-
add_compile_options(-std=c++11 -Wall)
4+
add_compile_options(-std=c++11)
55

66
# Modify cmake module path if new .cmake files are required
77
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/cmake")

cmake/FindSPQR.cmake

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPQR lib usually requires linking to a blas and lapack library.
22
# It is up to the user of this module to find a BLAS and link to it.
33

4-
# SPQR lib requires Cholmod, colamd and amd as well.
4+
# SPQR lib requires Cholmod, colamd and amd as well.
55
# FindCholmod.cmake can be used to find those packages before finding spqr
66

77
if (SPQR_INCLUDES AND SPQR_LIBRARIES)
@@ -23,11 +23,11 @@ find_library(SPQR_LIBRARIES spqr $ENV{SPQRDIR} ${LIB_INSTALL_DIR})
2323

2424
if(SPQR_LIBRARIES)
2525

26-
find_library(SUITESPARSE_LIBRARY SuiteSparse PATHS $ENV{SPQRDIR} ${LIB_INSTALL_DIR})
27-
if (SUITESPARSE_LIBRARY)
28-
set(SPQR_LIBRARIES ${SPQR_LIBRARIES} ${SUITESPARSE_LIBRARY})
29-
endif (SUITESPARSE_LIBRARY)
30-
26+
find_library(SUITESPARSECONFIG_LIBRARY NAMES suitesparseconfig PATHS $ENV{SPQRDIR} ${LIB_INSTALL_DIR})
27+
if (SUITESPARSECONFIG_LIBRARY)
28+
set(SPQR_LIBRARIES ${SPQR_LIBRARIES} ${SUITESPARSECONFIG_LIBRARY})
29+
endif (SUITESPARSECONFIG_LIBRARY)
30+
3131
endif(SPQR_LIBRARIES)
3232

3333
include(FindPackageHandleStandardArgs)

0 commit comments

Comments
 (0)