From de5caaf6bc89be01d2d9e88ffc8e8139e55b3417 Mon Sep 17 00:00:00 2001 From: Darth Vader Date: Tue, 5 Mar 2024 18:23:36 +0000 Subject: [PATCH] Squashed 'database/' changes from e0447f7a..9665bd4a 9665bd4a Updated for ubuntu 22.04 git-subtree-dir: database git-subtree-split: 9665bd4a81b47793f54efa908511c8caaa890d53 --- CMakeLists.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e2e54577..296e53842 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()