Rework the glog and gtest path checking to be consistent with the rest of the file and disable the dashboard support enabled by the earlier ctesting related patch.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8213e6a..7c1c19c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@
PROJECT(CERES C CXX)
-INCLUDE(CTest)
+ENABLE_TESTING()
# SuiteSparse
OPTION(SUITESPARSE
@@ -167,21 +167,22 @@
ON)
IF (GFLAGS)
+ SET(GFLAGS_SEARCH_LIBS
+ ${SEARCH_LIBS}
+ /usr/lib
+ /usr/local/lib
+ )
+
+ SET(GFLAGS_SEARCH_HEADERS
+ ${SEARCH_HEADERS}
+ /usr/include
+ /usr/local/include
+ )
+
MESSAGE("-- Check for Google Flags")
- FIND_LIBRARY(GFLAGS_LIB
- NAMES
- gflags
- PATH
- /usr/lib
- /usr/local/lib
- )
- FIND_PATH(GFLAGS_INCLUDE
- NAMES
- gflags/gflags.h
- PATH
- /usr/include
- /usr/local/include
- )
+ FIND_LIBRARY(GFLAGS_LIB NAMES gflags PATHS ${GFLAGS_SEARCH_LIBS})
+ FIND_PATH(GFLAGS_INCLUDE NAMES gflags/gflags.h PATHS ${GFLAGS_SEARCH_HEADERS})
+
IF (NOT EXISTS ${GFLAGS_LIB} OR NOT EXISTS ${GFLAGS_INCLUDE})
MESSAGE(FATAL_ERROR
"Can't find Google Flags. Please specify: "
@@ -195,21 +196,21 @@
ENDIF (GFLAGS)
# Google Logging
-MESSAGE("-- Check for Google Log")
-FIND_LIBRARY(GLOG_LIB
- NAMES
- glog
- PATH
+SET(GFLOG_SEARCH_LIBS
+ ${SEARCH_LIBS}
/usr/lib
/usr/local/lib
-)
-FIND_PATH(GLOG_INCLUDE
- NAMES
- glog/logging.h
- PATH
+ )
+
+SET(GLOG_SEARCH_HEADERS
+ ${SEARCH_HEADERS}
/usr/include
/usr/local/include
-)
+ )
+
+MESSAGE("-- Check for Google Log")
+FIND_LIBRARY(GLOG_LIB NAMES glog PATHS GLOG_SEARCH_LIBS)
+FIND_PATH(GLOG_INCLUDE NAMES glog/logging.h GLOG_SEARCH_HEADERS)
IF (NOT EXISTS ${GLOG_LIB} OR NOT EXISTS ${GLOG_INCLUDE})
MESSAGE(FATAL_ERROR
"Can't find Google Log. Please specify: "
