From a0cefc3347c32b2065053bbaff4f34d11529d931 Mon Sep 17 00:00:00 2001 From: Sameer Agarwal Date: Thu, 3 May 2012 08:38:33 -0700 Subject: [PATCH] Arnaus Gelas' patch to move to Ctest --- CMakeLists.txt | 2 +- internal/ceres/CMakeLists.txt | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 70336ae46..ed7dbc148 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,7 @@ ENDIF (COMMAND cmake_policy) PROJECT(CERES C CXX) -ENABLE_TESTING() +INCLUDE(CTest) # SuiteSparse OPTION(SUITESPARSE diff --git a/internal/ceres/CMakeLists.txt b/internal/ceres/CMakeLists.txt index f02db2326..7891138e5 100644 --- a/internal/ceres/CMakeLists.txt +++ b/internal/ceres/CMakeLists.txt @@ -139,8 +139,7 @@ ENDIF (PROTOBUF_FOUND) TARGET_LINK_LIBRARIES(ceres ${CERES_LIBRARY_DEPENDENCIES}) -OPTION(BUILD_TESTS "Build the unit tests." ON) -IF (BUILD_TESTS) +IF (BUILD_TESTING) ADD_LIBRARY(gtest gmock_gtest_all.cc gmock_main.cc) ADD_LIBRARY(test_util test_util.cc) TARGET_LINK_LIBRARIES(gtest ${GFLAGS_LIB} ${GLOG_LIB}) @@ -193,4 +192,4 @@ IF (BUILD_TESTS) CERES_TEST(unsymmetric_linear_solver) CERES_TEST(visibility) CERES_TEST(visibility_based_preconditioner) -ENDIF (BUILD_TESTS) +ENDIF (BUILD_TESTING)