added gtest to dist

CMakeLists.txt

@@ -376,10 +376,7 @@ if (BUILD_CLR_LIBS)
   endif()
 endif()
 
-if (EXISTS "${PROJECT_SOURCE_DIR}/CTestConfig.cmake")
+include (CTest)
-  # enable dashboard scripting
-  include (CTest)
-endif()
 
 if (STANDALONE_BUILD)
   

Makefile.am

@@ -5,4 +5,4 @@ EXTRA_DIST =\
 	IPhreeqcConfig.cmake.in\
 	IPhreeqc.rc\
 	resource.h
-SUBDIRS = src tests examples doc database
+SUBDIRS = src tests examples doc database gtest

configure.ac

@@ -134,6 +134,7 @@ AC_CONFIG_FILES([
   Makefile
   doc/Makefile
   examples/Makefile
+  gtest/Makefile
   src/Makefile
   tests/Makefile
   tests/phreeqc.dat

gtest/CMakeLists.txt

@@ -38,7 +38,7 @@ endif()
 
 # databases
 configure_file(
-  ../unit/phreeqc.dat.old
+  phreeqc.dat.old
   phreeqc.dat.old
   COPYONLY
   )
@@ -79,12 +79,6 @@ configure_file(
   COPYONLY
   )
 
-configure_file(
-  ../unit/llnl.dat.old
-  llnl.dat.old
-  COPYONLY
-  )
-
 configure_file(
   ../database/llnl.dat
   llnl.dat

gtest/Makefile.am

@@ -0,0 +1,17 @@
+EXTRA_DIST =\
+	CMakeLists.txt\
+	conv_fail.in\
+	dump\
+	FileTest.cpp\
+	FileTest.h\
+	iso.dat\
+	kinn20140218\
+	missing_e.dat\
+	multi_punch\
+	multi_punch_no_set\
+	phreeqc.dat.old\
+	TestCVar.cpp\
+	TestIPhreeqc.cpp\
+	TestIPhreeqcLib.cpp\
+	TestSelectedOutput.cpp\
+	TestVar.cpp