Merge commit 'de5caaf6bc89be01d2d9e88ffc8e8139e55b3417'

Author: Darth Vader

database/CMakeLists.txt

@@ -1,6 +1,3 @@
-# set standard directory locations
-include(GNUInstallDirs)
-
 set(phreeqc_DATABASE
   Amm.dat
   core10.dat
@@ -11,19 +8,20 @@ set(phreeqc_DATABASE
   minteq.dat
   minteq.v4.dat
   phreeqc.dat
+  PHREEQC_ThermoddemV1.10_15Dec2020.dat
   pitzer.dat
   sit.dat
   Tipping_Hurley.dat
   wateq4f.dat
-  )
+)
 
 # for mytest tests
 foreach(db ${phreeqc_DATABASE})
   configure_file(${db} ${db} COPYONLY)
 endforeach()
 
-if (WIN32)
-  install (FILES ${phreeqc_DATABASE} DESTINATION database)
+if(WIN32)
+  install(FILES ${phreeqc_DATABASE} DESTINATION database)
 else()
-  install (FILES ${phreeqc_DATABASE} DESTINATION ${CMAKE_INSTALL_DOCDIR}/database)
+  install(FILES ${phreeqc_DATABASE} DESTINATION ${CMAKE_INSTALL_DOCDIR}/database)
 endif()