commit 96f25dc57658d296ee6b6633818b4f1e51d7d587
author Sameer Agarwal <sameeragarwal@google.com> Fri Aug 17 15:34:42 2012 -0700
committer Sameer Agarwal <sameeragarwal@google.com> Fri Aug 17 15:34:42 2012 -0700
tree ea54ee285a868cbae73256edd3a0d98b1364067a
parent c497bd6cd9aa944f518aa491d3bc645851ff9594

Fix SuiteSparse3 UFConfig.h detection.

Change-Id: Ia59aefdb0ad7f713f76ed79692f2db4fa2821e5b

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 472ca1f..f410ea5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -204,7 +204,7 @@
 
 FIND_PATH(SUITESPARSE_CONFIG_INCLUDE
           NAMES SuiteSparse_config.h
-          PATHS ${SUITESPARSE_SEARCH_INCLUDES})
+          PATHS ${SUITESPARSE_SEARCH_HEADERS})
 IF (EXISTS ${SUITESPARSE_CONFIG_INCLUDE})
   MESSAGE("-- Found SuiteSparse_config header in: ${SUITESPARSE_CONFIG_INCLUDE}")
 ELSE (EXISTS ${SUITESPARSE_CONFIG_INCLUDE})
@@ -220,7 +220,7 @@
 
 FIND_PATH(UFCONFIG_INCLUDE
           NAMES UFconfig.h
-          PATHS ${SUITESPARSE_SEARCH_INCLUDES})
+          PATHS ${SUITESPARSE_SEARCH_INCLUDE})
 IF (EXISTS ${UFCONFIG_INCLUDE})
   MESSAGE("-- Found UFconfig header in: ${UFCONFIG_INCLUDE}")
 ELSE (EXISTS ${UFCONFIG_INCLUDE})

internal/ceres/CMakeLists.txt

diff --git a/internal/ceres/CMakeLists.txt b/internal/ceres/CMakeLists.txt
index 6f35e96..6be2873 100644
--- a/internal/ceres/CMakeLists.txt
+++ b/internal/ceres/CMakeLists.txt
@@ -222,7 +222,11 @@
   CERES_TEST(schur_eliminator)
   CERES_TEST(schur_ordering)
   CERES_TEST(solver_impl)
-  CERES_TEST(suitesparse)
+
+  IF (${SUITESPARSE_FOUND})
+    CERES_TEST(suitesparse)
+  ENDIF (${SUITESPARSE_FOUND})
+
   CERES_TEST(symmetric_linear_solver)
   CERES_TEST(triplet_sparse_matrix)
   CERES_TEST(trust_region_minimizer)