max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-15 16:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into viscosity

Browse Source
This commit is contained in:
David Parkhurst 2024-04-05 17:42:33 -06:00
commit 87eeeec83e
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -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()

1
Makefile.am
View File

@ -15,6 +15,7 @@ DATABASE=\
llnl.dat\
minteq.dat\
minteq.v4.dat\
PHREEQC_ThermoddemV1.10_15Dec2020.dat\
phreeqc.dat\
pitzer.dat\
sit.dat\