From 264c560a2c43d7abbc0563a05d96adf77841ba9c Mon Sep 17 00:00:00 2001 From: matlabbe Date: Sat, 16 Mar 2024 17:10:34 -0700 Subject: [PATCH] reverted 87faea7a859b6716e7e4516d748d51bc9c8590b3 for #783 (just don't include OptimizerCeres if -DWITH_CERES=OFF even if floam or okvis did include it) --- CMakeLists.txt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ecd3aef20..89f7c2e25e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -892,9 +892,9 @@ ENDIF() IF(NOT MRPT_FOUND) SET(MRPT "//") ENDIF(NOT MRPT_FOUND) -IF(NOT CERES_FOUND) +IF(NOT WITH_CERES OR NOT CERES_FOUND) SET(CERES "//") -ENDIF(NOT CERES_FOUND) +ENDIF(NOT WITH_CERES OR NOT CERES_FOUND) IF(NOT WITH_TORO) SET(TORO "//") ENDIF(NOT WITH_TORO) @@ -1406,12 +1406,8 @@ ELSE() MESSAGE(STATUS " *With GTSAM = NO (GTSAM not found)") ENDIF() -IF(CERES_FOUND) -IF(WITH_CERES) +IF(WITH_CERES AND CERES_FOUND) MESSAGE(STATUS " *With Ceres ${Ceres_VERSION} = YES (License: BSD)") -ELSE() -MESSAGE(STATUS " *With Ceres ${Ceres_VERSION} = YES (License: BSD, WITH_CERES=OFF but it is enabled by okvis or floam dependencies)") -ENDIF() ELSEIF(NOT WITH_CERES) MESSAGE(STATUS " *With Ceres = NO (WITH_CERES=OFF)") ELSE()