113 lines
4.5 KiB
Diff
113 lines
4.5 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 2d241fe..b79454d 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -244,7 +244,7 @@ else (CUDA)
|
||
|
|
endif (CUDA)
|
||
|
|
|
||
|
|
if (LAPACK)
|
||
|
|
- find_package(LAPACK QUIET)
|
||
|
|
+ find_package(LAPACK REQUIRED)
|
||
|
|
if (LAPACK_FOUND)
|
||
|
|
message("-- Found LAPACK library: ${LAPACK_LIBRARIES}")
|
||
|
|
else (LAPACK_FOUND)
|
||
|
|
@@ -266,7 +266,8 @@ if (SUITESPARSE)
|
||
|
|
# built with SuiteSparse support.
|
||
|
|
|
||
|
|
# Check for SuiteSparse and dependencies.
|
||
|
|
- find_package(SuiteSparse 4.0 COMPONENTS CHOLMOD SPQR)
|
||
|
|
+ find_package(suitesparse CONFIG REQUIRED)
|
||
|
|
+ set(SuiteSparse_FOUND 1)
|
||
|
|
if (SuiteSparse_FOUND)
|
||
|
|
set(SuiteSparse_DEPENDENCY "find_dependency(SuiteSparse ${SuiteSparse_VERSION})")
|
||
|
|
# By default, if all of SuiteSparse's dependencies are found, Ceres is
|
||
|
|
@@ -274,11 +275,11 @@ if (SUITESPARSE)
|
||
|
|
message("-- Found SuiteSparse ${SuiteSparse_VERSION}, "
|
||
|
|
"building with SuiteSparse.")
|
||
|
|
|
||
|
|
- if (SuiteSparse_NO_CMAKE OR NOT SuiteSparse_DIR)
|
||
|
|
+ if (0)
|
||
|
|
install(FILES ${Ceres_SOURCE_DIR}/cmake/FindSuiteSparse.cmake
|
||
|
|
${Ceres_SOURCE_DIR}/cmake/FindMETIS.cmake
|
||
|
|
DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR})
|
||
|
|
- endif (SuiteSparse_NO_CMAKE OR NOT SuiteSparse_DIR)
|
||
|
|
+ endif ()
|
||
|
|
else (SuiteSparse_FOUND)
|
||
|
|
# Disable use of SuiteSparse if it cannot be found and continue.
|
||
|
|
message("-- Did not find all SuiteSparse dependencies, disabling "
|
||
|
|
@@ -294,7 +295,7 @@ endif (SUITESPARSE)
|
||
|
|
# CXSparse.
|
||
|
|
if (CXSPARSE)
|
||
|
|
# Don't search with REQUIRED as we can continue without CXSparse.
|
||
|
|
- find_package(CXSparse)
|
||
|
|
+ find_package(CXSparse REQUIRED)
|
||
|
|
if (CXSparse_FOUND)
|
||
|
|
set(CXSparse_DEPENDENCY "find_dependency(CXSparse ${CXSparse_VERSION})")
|
||
|
|
# By default, if CXSparse and all dependencies are found, Ceres is
|
||
|
|
@@ -302,10 +303,10 @@ if (CXSPARSE)
|
||
|
|
message("-- Found CXSparse version: ${CXSparse_VERSION}, "
|
||
|
|
"building with CXSparse.")
|
||
|
|
|
||
|
|
- if (CXSparse_NO_CMAKE OR NOT CXSparse_DIR)
|
||
|
|
+ if (0)
|
||
|
|
install(FILES ${Ceres_SOURCE_DIR}/cmake/FindCXSparse.cmake
|
||
|
|
DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR})
|
||
|
|
- endif (CXSparse_NO_CMAKE OR NOT CXSparse_DIR)
|
||
|
|
+ endif ()
|
||
|
|
else (CXSparse_FOUND)
|
||
|
|
# Disable use of CXSparse if it cannot be found and continue.
|
||
|
|
message("-- Did not find CXSparse, Building without CXSparse.")
|
||
|
|
@@ -367,9 +368,10 @@ endif()
|
||
|
|
# GFlags.
|
||
|
|
if (GFLAGS)
|
||
|
|
# Don't search with REQUIRED as we can continue without gflags.
|
||
|
|
- find_package(gflags 2.2.0)
|
||
|
|
+ find_package(gflags CONFIG REQUIRED)
|
||
|
|
if (gflags_FOUND)
|
||
|
|
- if (TARGET gflags)
|
||
|
|
+ if (TARGET gflags::gflags)
|
||
|
|
+ add_library(gflags ALIAS gflags::gflags)
|
||
|
|
message("-- Found Google Flags (gflags) version ${gflags_VERSION}: ${gflags_DIR}")
|
||
|
|
else()
|
||
|
|
message("-- Detected version of gflags: ${gflags_VERSION} does not define "
|
||
|
|
@@ -420,7 +422,7 @@ set_ceres_threading_model("${CERES_THREADING_MODEL}")
|
||
|
|
|
||
|
|
if (BUILD_BENCHMARKS)
|
||
|
|
# Version 1.3 was first to provide import targets
|
||
|
|
- find_package(benchmark 1.3 QUIET)
|
||
|
|
+ find_package(benchmark CONFIG REQUIRED)
|
||
|
|
if (benchmark_FOUND)
|
||
|
|
message("-- Found Google benchmark library. Building Ceres benchmarks.")
|
||
|
|
else()
|
||
|
|
@@ -611,7 +613,7 @@ create_ceres_config("${CERES_COMPILE_OPTIONS}"
|
||
|
|
add_subdirectory(internal/ceres)
|
||
|
|
|
||
|
|
if (BUILD_DOCUMENTATION)
|
||
|
|
- find_package(Sphinx)
|
||
|
|
+ find_package(Sphinx REQUIRED)
|
||
|
|
if (NOT SPHINX_FOUND)
|
||
|
|
message("-- Failed to find Sphinx and/or its dependencies, disabling build of documentation.")
|
||
|
|
update_cache_variable(BUILD_DOCUMENTATION OFF)
|
||
|
|
diff --git a/internal/ceres/CMakeLists.txt b/internal/ceres/CMakeLists.txt
|
||
|
|
index 299b373..33d41d8 100644
|
||
|
|
--- a/internal/ceres/CMakeLists.txt
|
||
|
|
+++ b/internal/ceres/CMakeLists.txt
|
||
|
|
@@ -108,14 +108,14 @@ endif (NOT MINIGLOG)
|
||
|
|
if (SUITESPARSE AND SuiteSparse_FOUND)
|
||
|
|
# Define version information for use in Solver::FullReport.
|
||
|
|
add_definitions(-DCERES_SUITESPARSE_VERSION="${SuiteSparse_VERSION}")
|
||
|
|
- list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES SuiteSparse::CHOLMOD
|
||
|
|
- SuiteSparse::SPQR)
|
||
|
|
+ list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES SuiteSparse::cholmod
|
||
|
|
+ SuiteSparse::spqr)
|
||
|
|
endif (SUITESPARSE AND SuiteSparse_FOUND)
|
||
|
|
|
||
|
|
if (CXSPARSE AND CXSparse_FOUND)
|
||
|
|
# Define version information for use in Solver::FullReport.
|
||
|
|
add_definitions(-DCERES_CXSPARSE_VERSION="${CXSparse_VERSION}")
|
||
|
|
- list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES CXSparse::CXSparse)
|
||
|
|
+ list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES ${CXSparse_LIBRARIES})
|
||
|
|
endif (CXSPARSE AND CXSparse_FOUND)
|
||
|
|
|
||
|
|
if (ACCELERATESPARSE AND AccelerateSparse_FOUND)
|