mirror of
https://github.com/ceres-solver/ceres-solver.git
synced 2026-08-29 16:40:38 +08:00
Fix reporting of METIS version
- Also fixes behaviour of EIGENMETIS option to match that of the other CMake dependency options, and ensure that its value aligns exactly with whether Eigen support for METIS will be compiled into Ceres. Change-Id: Ifbf6f5d82b9ba89a156673eb6042519a985e6b04
This commit is contained in:
+7
-4
@@ -311,12 +311,15 @@ if (EIGENMETIS)
|
||||
install(FILES ${Ceres_SOURCE_DIR}/cmake/FindMETIS.cmake
|
||||
DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR})
|
||||
endif (NOT METIS_DIR)
|
||||
else (METIS_FOUND)
|
||||
message("-- Did not find METIS, disabling Eigen METIS support.")
|
||||
update_cache_variable(EIGENMETIS OFF)
|
||||
list (APPEND CERES_COMPILE_OPTIONS CERES_NO_EIGEN_METIS)
|
||||
endif (METIS_FOUND)
|
||||
endif (EIGENMETIS)
|
||||
|
||||
if (NOT EIGENMETIS OR NOT METIS_FOUND)
|
||||
else (EIGENMETIS)
|
||||
message("-- Building without Eigen METIS support.")
|
||||
list (APPEND CERES_COMPILE_OPTIONS CERES_NO_EIGEN_METIS)
|
||||
endif (NOT EIGENMETIS OR NOT METIS_FOUND)
|
||||
endif (EIGENMETIS)
|
||||
|
||||
if (ACCELERATESPARSE)
|
||||
find_package(AccelerateSparse)
|
||||
|
||||
@@ -62,7 +62,7 @@ constexpr char kVersion[] =
|
||||
"-suitesparse-(" CERES_SUITESPARSE_VERSION ")"
|
||||
#endif
|
||||
|
||||
#ifndef CERES_NO_EIGEN_METIS
|
||||
#if !defined(CERES_NO_EIGEN_METIS) || !defined(CERES_NO_CHOLMOD_PARTITION)
|
||||
"-metis-(" CERES_METIS_VERSION ")"
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user