From 9665bd4a81b47793f54efa908511c8caaa890d53 Mon Sep 17 00:00:00 2001 From: "Charlton, Scott R" Date: Tue, 28 Nov 2023 19:04:46 -0700 Subject: [PATCH 1/2] Updated for ubuntu 22.04 --- CMakeLists.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e2e5457..296e5384 100644 --- a/CMakeLists.txt +++ b/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() From 976555e201ea1ba8a0f37a78edfeec0e1550dd98 Mon Sep 17 00:00:00 2001 From: "Charlton, Scott R" Date: Wed, 3 Jan 2024 13:34:35 -0700 Subject: [PATCH 2/2] Added PHREEQC_ThermoddemV1.10_15Dec2020.dat --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index 25a6ba47..1c468a37 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,6 +15,7 @@ DATABASE=\ llnl.dat\ minteq.dat\ minteq.v4.dat\ + PHREEQC_ThermoddemV1.10_15Dec2020.dat\ phreeqc.dat\ pitzer.dat\ sit.dat\