Skip to content

Commit de5caaf

Browse files
author
Darth Vader
committed
Squashed 'database/' changes from e0447f7a..9665bd4a
9665bd4a Updated for ubuntu 22.04 git-subtree-dir: database git-subtree-split: 9665bd4a81b47793f54efa908511c8caaa890d53
1 parent f4648dd commit de5caaf

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

CMakeLists.txt

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# set standard directory locations
2-
include(GNUInstallDirs)
3-
41
set(phreeqc_DATABASE
52
Amm.dat
63
core10.dat
@@ -11,19 +8,20 @@ set(phreeqc_DATABASE
118
minteq.dat
129
minteq.v4.dat
1310
phreeqc.dat
11+
PHREEQC_ThermoddemV1.10_15Dec2020.dat
1412
pitzer.dat
1513
sit.dat
1614
Tipping_Hurley.dat
1715
wateq4f.dat
18-
)
16+
)
1917

2018
# for mytest tests
2119
foreach(db ${phreeqc_DATABASE})
2220
configure_file(${db} ${db} COPYONLY)
2321
endforeach()
2422

25-
if (WIN32)
26-
install (FILES ${phreeqc_DATABASE} DESTINATION database)
23+
if(WIN32)
24+
install(FILES ${phreeqc_DATABASE} DESTINATION database)
2725
else()
28-
install (FILES ${phreeqc_DATABASE} DESTINATION ${CMAKE_INSTALL_DOCDIR}/database)
26+
install(FILES ${phreeqc_DATABASE} DESTINATION ${CMAKE_INSTALL_DOCDIR}/database)
2927
endif()

0 commit comments

Comments
 (0)