merged master into viscosity

usgs-coupled · Apr 5, 2024 · bf765a3 · bf765a3
2 parents 2eae3b0 + 1594ee6
commit bf765a3
Show file tree

Hide file tree

Showing 8 changed files with 1,372 additions and 325 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/HTMLversion/CMakeLists.txt b/HTMLversion/CMakeLists.txt
@@ -1 +1 @@
-install (FILES phreeqc3.chm DESTINATION ${CMAKE_INSTALL_DOCDIR})
+install (FILES phreeqc3.chm DESTINATION ${CMAKE_INSTALL_DOCDIR})
diff --git a/configure.ac b/configure.ac
@@ -20,6 +20,9 @@ AC_LANG(C++)
 
 # Checks for libraries.
 
+# c++11 is required
+AX_CXX_COMPILE_STDCXX(11, [ext], [mandatory])
+
 # Checks for header files.
 AC_CHECK_HEADERS([float.h limits.h memory.h stddef.h stdlib.h])
 

diff --git a/doc/.gitlab-ci.yml b/doc/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 #
 # https://code.chs.usgs.gov/coupled/subtrees/phreeqc3-doc
-# SRC 2020-12-02T18:39:55-07:00
+# SRC 2020-12-02T18:39:55-07:01
 #
 image: ${CI_REGISTRY}/coupled/containers/buildpack-deps:bionic-scm
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		install (FILES phreeqc3.chm DESTINATION ${CMAKE_INSTALL_DOCDIR})
		install (FILES phreeqc3.chm DESTINATION ${CMAKE_INSTALL_DOCDIR})