tests: include gtest

This is mostly needed for install scripts like homebrew, so the install won't error out on accepting the ssl cert

.gitignore

@@ -10,7 +10,7 @@
 !src/maxent_kernel.cpp
 !src/maxent_grid.hpp
 !test/gridTest.cpp
-src/!maxent_kernel.hpp
+!src/maxent_kernel.hpp
 !src/maxent_parms.h
 !src/maxent_simulation.cpp
 !test/simulationTest.cpp
@@ -40,6 +40,7 @@ src/!maxent_kernel.hpp
 !COPYRIGHT.TXT
 !HEADER.TXT
 !scripts/
+!test/gtest*
 
 .DS_Store
 *.pyc

CMakeLists.txt

@@ -22,23 +22,16 @@ configure_file(
 include_directories("${PROJECT_BINARY_DIR}/config")
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 message(STATUS "Finding packages, please stand by...")
-include(UseGtest)
 find_package(GSL REQUIRED)
 find_package (Eigen3 3.1 REQUIRED)
 
-set (GTEST_INCLUDE_DIR ${GTEST_ROOT}/include )
-set (GTEST_SRC_DIR ${GTEST_ROOT}/src)
-
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -DNDEBUG -Wno-return-type-c-linkage")
 
 #let gcc take advantage of Eigen3 vectorization
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2")
 endif()
 
-include_directories(${CMAKE_SOURCE_DIR}/gtest/include)
-include_directories(${GTEST_INCLUDE_DIR})
-include_directories(${GTEST_ROOT})
 include_directories(${GSL_INCLUDE_DIR})
 include_directories(${EIGEN3_INCLUDE_DIR})
 

cmake/EnableGtests.cmake

@@ -15,10 +15,10 @@ function(add_gtest test)
 
     if(${ARGC} EQUAL 2)
         set(source "${ARGV1}/${test}")
-        set(gtest_src "${GTEST_SRC_DIR}/gtest_main.cc;${GTEST_SRC_DIR}/gtest-all.cc")
+        set(gtest_src "${ARGV1}/gtest_main.cc;${ARGV1}/gtest-all.cc")
     else(${ARGC} EQUAL 2)
         set(source "${test}")
-        set(gtest_src "${GTEST_SRC_DIR}/gtest_main.cc;${GTEST_SRC_DIR}/gtest-all.cc")
+        set(gtest_src "gtest/gtest_main.cc;gtest/gtest-all.cc")
     endif(${ARGC} EQUAL 2)
 
     add_executable(${test} ${source} ${gtest_src})

src/maxent.hpp

@@ -10,7 +10,6 @@
 #include "maxent_matrix_def.hpp"
 #include "maxent_parms.hpp"
 #include <boost/random/mersenne_twister.hpp>
-#include"gtest/gtest.h"
 
 struct ofstream_ : std::ofstream{
     explicit ofstream_(std::streamsize precision=10){

test/backcontTest.cpp

@@ -4,7 +4,7 @@
  * For use in publications, see ACKNOWLEDGE.TXT
  */
 #include "../src/maxent.hpp"
-#include "gtest/gtest.h"
+#include "gtest.h"
 #include "../src/maxent_backcont.hpp"
 
 inline vector_type getA(){

test/default_modelTest.cpp

@@ -7,7 +7,7 @@
 
 #include "../src/default_model.hpp"
 #include <alps/utilities/temporary_filename.hpp>
-#include"gtest/gtest.h"
+#include"gtest.h"
 #include <fstream>
 #include "write_test_files.hpp"
 

test/gridTest.cpp

@@ -6,7 +6,7 @@
 
 #include "../src/maxent.hpp"
 #include "../src/maxent_grid.hpp"
-#include "gtest/gtest.h"
+#include "gtest.h"
 #include <fstream>
 
 //these tests only make sure the grids are initiallized