diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a080333c..03511a49b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,320 +1,325 @@ -cmake_minimum_required(VERSION 3.3) - -project(phreeqc) - -# overide docdir on windows -if(WIN32 AND NOT CMAKE_INSTALL_DOCDIR) - set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (doc)") - set(CMAKE_INSTALL_DOCDIR "doc") -endif() - -include(GNUInstallDirs) - -set(phreeqc_SOURCES -src/ChartHandler.cpp -src/ChartObject.cpp -src/CurveObject.cpp -src/Dictionary.cpp -src/Dictionary.h -src/ExchComp.cxx -src/ExchComp.h -src/Exchange.cxx -src/Exchange.h -src/GasComp.cxx -src/GasComp.h -src/GasPhase.cxx -src/GasPhase.h -src/ISolution.cxx -src/ISolution.h -src/ISolutionComp.cxx -src/ISolutionComp.h -src/KineticsComp.cxx -src/KineticsComp.h -src/NA.h -src/NameDouble.cxx -src/NameDouble.h -src/NumKeyword.cxx -src/NumKeyword.h -src/PBasic.cpp -src/PBasic.h -src/PHRQ_io_output.cpp -src/PPassemblage.cxx -src/PPassemblage.h -src/PPassemblageComp.cxx -src/PPassemblageComp.h -src/Phreeqc.cpp -src/Phreeqc.h -src/PhreeqcKeywords/Keywords.cpp -src/PhreeqcKeywords/Keywords.h -src/Pressure.cxx -src/Pressure.h -src/Reaction.cxx -src/Reaction.h -src/ReadClass.cxx -src/SS.cxx -src/SS.h -src/SSassemblage.cxx -src/SSassemblage.h -src/SScomp.cxx -src/SScomp.h -src/SelectedOutput.cpp -src/SelectedOutput.h -src/Serializer.cxx -src/Serializer.h -src/Solution.cxx -src/Solution.h -src/SolutionIsotope.cxx -src/SolutionIsotope.h -src/StorageBin.cxx -src/StorageBin.h -src/StorageBinList.cpp -src/StorageBinList.h -src/Surface.cxx -src/Surface.h -src/SurfaceCharge.cxx -src/SurfaceCharge.h -src/SurfaceComp.cxx -src/SurfaceComp.h -src/System.cxx -src/System.h -src/Temperature.cxx -src/Temperature.h -src/Use.cpp -src/Use.h -src/UserPunch.cpp -src/UserPunch.h -src/advection.cpp -src/basicsubs.cpp -src/cl1.cpp -src/class_main.cpp -src/common/PHRQ_base.cxx -src/common/PHRQ_base.h -src/common/PHRQ_io.cpp -src/common/PHRQ_io.h -src/common/Parser.cxx -src/common/Parser.h -src/common/Utils.cxx -src/common/Utils.h -src/common/phrqtype.h -src/cvdense.cpp -src/cvdense.h -src/cvode.cpp -src/cvode.h -src/cxxKinetics.cxx -src/cxxKinetics.h -src/cxxMix.cxx -src/cxxMix.h -src/dense.cpp -src/dense.h -src/dumper.cpp -src/dumper.h -src/gases.cpp -src/global_structures.h -src/input.cpp -src/integrate.cpp -src/inverse.cpp -src/isotopes.cpp -src/kinetics.cpp -src/mainsubs.cpp -src/model.cpp -src/nvector.cpp -src/nvector.h -src/nvector_serial.cpp -src/nvector_serial.h -src/parse.cpp -src/phqalloc.cpp -src/phqalloc.h -src/pitzer.cpp -src/pitzer_structures.cpp -src/prep.cpp -src/print.cpp -src/read.cpp -src/readtr.cpp -src/runner.cpp -src/runner.h -src/sit.cpp -src/smalldense.cpp -src/smalldense.h -src/spread.cpp -src/step.cpp -src/structures.cpp -src/sundialsmath.cpp -src/sundialsmath.h -src/sundialstypes.h -src/tally.cpp -src/tidy.cpp -src/transport.cpp -src/utilities.cpp -) - -option(PHRQC_USE_GMP "Use GNU Multiple Precision library" OFF) -if(PHRQC_USE_GMP) - find_path(GMP_INCLUDE_PATH gmp.h) - find_library(GMP_LIBRARY gmp) -else() - mark_as_advanced(FORCE GMP_INCLUDE_PATH GMP_LIBRARY) -endif() - -if(PHRQC_USE_GMP) - if(GMP_INCLUDE_PATH) - set(phreeqc_SOURCES ${phreeqc_SOURCES} src/cl1mp.cpp) - endif() -endif() - -option(PHRQC_TESTING "Set TESTING preprocessor definition" OFF) - -if(MSVC) - - # Copy Release to ClrRelease - SET(CMAKE_CXX_FLAGS_CLRRELEASE ${CMAKE_CXX_FLAGS_RELEASE} CACHE STRING - "Flags used by the C++ compiler during ClrRelease builds." - FORCE) - SET(CMAKE_C_FLAGS_CLRRELEASE ${CMAKE_C_FLAGS_RELEASE} CACHE STRING - "Flags used by the C compiler during ClrRelease builds." - FORCE) - SET(CMAKE_EXE_LINKER_FLAGS_CLRRELEASE - ${CMAKE_EXE_LINKER_FLAGS_RELEASE} CACHE STRING - "Flags used for linking binaries during ClrRelease builds." - FORCE) - SET(CMAKE_SHARED_LINKER_FLAGS_CLRRELEASE - ${CMAKE_SHARED_LINKER_FLAGS_RELEASE} CACHE STRING - "Flags used by the shared libraries linker during ClrRelease builds." - FORCE) - MARK_AS_ADVANCED( - CMAKE_CXX_FLAGS_CLRRELEASE - CMAKE_C_FLAGS_CLRRELEASE - CMAKE_EXE_LINKER_FLAGS_CLRRELEASE - CMAKE_SHARED_LINKER_FLAGS_CLRRELEASE ) - - - # Copy Debug to ClrDebug - SET(CMAKE_CXX_FLAGS_CLRDEBUG ${CMAKE_CXX_FLAGS_DEBUG} CACHE STRING - "Flags used by the C++ compiler during ClrDebug builds." - FORCE) - SET(CMAKE_C_FLAGS_CLRDEBUG ${CMAKE_C_FLAGS_DEBUG} CACHE STRING - "Flags used by the C compiler during ClrDebug builds." - FORCE) - SET(CMAKE_EXE_LINKER_FLAGS_CLRDEBUG - ${CMAKE_EXE_LINKER_FLAGS_DEBUG} CACHE STRING - "Flags used for linking binaries during ClrDebug builds." - FORCE) - SET(CMAKE_SHARED_LINKER_FLAGS_CLRDEBUG - ${CMAKE_SHARED_LINKER_FLAGS_DEBUG} CACHE STRING - "Flags used by the shared libraries linker during ClrDebug builds." - FORCE) - MARK_AS_ADVANCED( - CMAKE_CXX_FLAGS_CLRDEBUG - CMAKE_C_FLAGS_CLRDEBUG - CMAKE_EXE_LINKER_FLAGS_CLRDEBUG - CMAKE_SHARED_LINKER_FLAGS_CLRDEBUG ) - - - # Remove /EHsc from CMAKE_CXX_FLAGS - STRING(REPLACE " /EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) - STRING(REPLACE "/EHsc " "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) - SET(CMAKE_CXX_FLAGS - "${CMAKE_CXX_FLAGS}" CACHE STRING - "Flags used by the compiler during all build types." - FORCE) - - # Add /EHsc to CMAKE_CXX_FLAGS_RELEASE - STRING(REPLACE "/EHsc " "" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) - STRING(REPLACE " /EHsc" "" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) - SET(CMAKE_CXX_FLAGS_RELEASE - "/EHsc ${CMAKE_CXX_FLAGS_RELEASE}" CACHE STRING - "Flags used by the compiler during Release build types." - FORCE) - - # Add /EHsc to CMAKE_CXX_FLAGS_DEBUG - STRING(REPLACE "/EHsc " "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) - STRING(REPLACE " /EHsc" "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) - SET(CMAKE_CXX_FLAGS_DEBUG - "/EHsc ${CMAKE_CXX_FLAGS_DEBUG}" CACHE STRING - "Flags used by the compiler during Debug build types." - FORCE) - - # Add /EHa and /clr to CMAKE_CXX_FLAGS_CLRRELEASE - STRING(REPLACE "/EHsc " "" CMAKE_CXX_FLAGS_CLRRELEASE ${CMAKE_CXX_FLAGS_CLRRELEASE}) - STRING(REPLACE " /EHsc" "" CMAKE_CXX_FLAGS_CLRRELEASE ${CMAKE_CXX_FLAGS_CLRRELEASE}) - SET(CMAKE_CXX_FLAGS_CLRRELEASE - "-DMULTICHART /EHa ${CMAKE_CXX_FLAGS_CLRRELEASE} /clr" CACHE STRING - "Flags used by the compiler during ClrRelease builds." - FORCE) - - # Add /EHa and /clr to CMAKE_CXX_FLAGS_CLRDEBUG - STRING(REPLACE "/EHsc " "" CMAKE_CXX_FLAGS_CLRDEBUG ${CMAKE_CXX_FLAGS_CLRDEBUG}) - STRING(REPLACE " /EHsc" "" CMAKE_CXX_FLAGS_CLRDEBUG ${CMAKE_CXX_FLAGS_CLRDEBUG}) - STRING(REPLACE " /RTC1" " " CMAKE_CXX_FLAGS_CLRDEBUG "${CMAKE_CXX_FLAGS_CLRDEBUG}") - STRING(REPLACE "/RTC1 " " " CMAKE_CXX_FLAGS_CLRDEBUG "${CMAKE_CXX_FLAGS_CLRDEBUG}") - SET(CMAKE_CXX_FLAGS_CLRDEBUG - "-DMULTICHART /EHa ${CMAKE_CXX_FLAGS_CLRDEBUG} /clr" CACHE STRING - "Flags used by the compiler during ClrDebug builds." - FORCE) - - SET(CMAKE_CONFIGURATION_TYPES "Debug;Release;ClrDebug;ClrRelease" CACHE STRING - "Semicolon separated list of supported configuration types." - FORCE) -endif() - -add_executable(phreeqc ${phreeqc_SOURCES}) -set_target_properties(phreeqc PROPERTIES DEBUG_POSTFIX "d") - -# Add '#define TESTING' -if(PHRQC_TESTING) - target_compile_definitions(phreeqc PRIVATE TESTING) -endif() - -# force utf-8 -target_compile_options(phreeqc PRIVATE "$<$:/utf-8>") -target_compile_options(phreeqc PRIVATE "$<$:/utf-8>") - -# Disable deprecation warnings for standard C and STL functions in VS2005 -# and later -if(MSVC_VERSION EQUAL 1400 OR MSVC_VERSION GREATER 1400) - target_compile_definitions(phreeqc PRIVATE _CRT_SECURE_NO_DEPRECATE) - target_compile_definitions(phreeqc PRIVATE _SCL_SECURE_NO_WARNINGS) -endif() - -# define DOS -if(WIN32) - target_compile_definitions(phreeqc PRIVATE DOS) - target_compile_definitions(phreeqc PRIVATE _CONSOLE) -endif() - -target_include_directories(phreeqc PRIVATE "${PROJECT_SOURCE_DIR}/src") -target_include_directories(phreeqc PRIVATE "${PROJECT_SOURCE_DIR}/src/common") -target_include_directories(phreeqc PRIVATE "${PROJECT_SOURCE_DIR}/src/PhreeqcKeywords") - -if(PHRQC_USE_GMP) - if(GMP_INCLUDE_PATH) - target_compile_definitions(phreeqc PRIVATE INVERSE_CL1MP) - target_include_directories(phreeqc PRIVATE "${GMP_INCLUDE_PATH}") - endif() - if(GMP_LIBRARY) - target_link_libraries(phreeqc ${GMP_LIBRARY}) - endif() -endif() - -if(WIN32) - install(TARGETS phreeqc DESTINATION "${CMAKE_INSTALL_BINDIR}/Release" CONFIGURATIONS Debug Release) - install(TARGETS phreeqc DESTINATION "${CMAKE_INSTALL_BINDIR}/ClrRelease" CONFIGURATIONS ClrDebug ClrRelease) -else() - install(TARGETS phreeqc DESTINATION "${CMAKE_INSTALL_BINDIR}") -endif() - -# tests -include(CTest) - -# subdirectories -add_subdirectory(database) -add_subdirectory(doc) -add_subdirectory(examples) -if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/mytest/CMakeLists.txt) - add_subdirectory(mytest) -endif() - - -# Setup references for /CLR -if(MSVC) - set_target_properties(phreeqc PROPERTIES VS_DOTNET_REFERENCES "System;System.Drawing;System.Windows.Forms;${CMAKE_CURRENT_SOURCE_DIR}/src/ZedGraph.dll") -endif() +cmake_minimum_required(VERSION 3.3) + +project(phreeqc) + +# overide docdir on windows +if(WIN32 AND NOT CMAKE_INSTALL_DOCDIR) + set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (doc)") + set(CMAKE_INSTALL_DOCDIR "doc") +endif() + +include(GNUInstallDirs) + +set(phreeqc_SOURCES +src/ChartHandler.cpp +src/ChartObject.cpp +src/CurveObject.cpp +src/Dictionary.cpp +src/Dictionary.h +src/ExchComp.cxx +src/ExchComp.h +src/Exchange.cxx +src/Exchange.h +src/GasComp.cxx +src/GasComp.h +src/GasPhase.cxx +src/GasPhase.h +src/ISolution.cxx +src/ISolution.h +src/ISolutionComp.cxx +src/ISolutionComp.h +src/KineticsComp.cxx +src/KineticsComp.h +src/NA.h +src/NameDouble.cxx +src/NameDouble.h +src/NumKeyword.cxx +src/NumKeyword.h +src/PBasic.cpp +src/PBasic.h +src/PHRQ_io_output.cpp +src/PPassemblage.cxx +src/PPassemblage.h +src/PPassemblageComp.cxx +src/PPassemblageComp.h +src/Phreeqc.cpp +src/Phreeqc.h +src/PhreeqcKeywords/Keywords.cpp +src/PhreeqcKeywords/Keywords.h +src/Pressure.cxx +src/Pressure.h +src/Reaction.cxx +src/Reaction.h +src/ReadClass.cxx +src/SS.cxx +src/SS.h +src/SSassemblage.cxx +src/SSassemblage.h +src/SScomp.cxx +src/SScomp.h +src/SelectedOutput.cpp +src/SelectedOutput.h +src/Serializer.cxx +src/Serializer.h +src/Solution.cxx +src/Solution.h +src/SolutionIsotope.cxx +src/SolutionIsotope.h +src/StorageBin.cxx +src/StorageBin.h +src/StorageBinList.cpp +src/StorageBinList.h +src/Surface.cxx +src/Surface.h +src/SurfaceCharge.cxx +src/SurfaceCharge.h +src/SurfaceComp.cxx +src/SurfaceComp.h +src/System.cxx +src/System.h +src/Temperature.cxx +src/Temperature.h +src/Use.cpp +src/Use.h +src/UserPunch.cpp +src/UserPunch.h +src/advection.cpp +src/basicsubs.cpp +src/cl1.cpp +src/class_main.cpp +src/common/PHRQ_base.cxx +src/common/PHRQ_base.h +src/common/PHRQ_io.cpp +src/common/PHRQ_io.h +src/common/Parser.cxx +src/common/Parser.h +src/common/Utils.cxx +src/common/Utils.h +src/common/phrqtype.h +src/cvdense.cpp +src/cvdense.h +src/cvode.cpp +src/cvode.h +src/cxxKinetics.cxx +src/cxxKinetics.h +src/cxxMix.cxx +src/cxxMix.h +src/dense.cpp +src/dense.h +src/dumper.cpp +src/dumper.h +src/gases.cpp +src/global_structures.h +src/input.cpp +src/integrate.cpp +src/inverse.cpp +src/isotopes.cpp +src/kinetics.cpp +src/mainsubs.cpp +src/model.cpp +src/nvector.cpp +src/nvector.h +src/nvector_serial.cpp +src/nvector_serial.h +src/parse.cpp +src/phqalloc.cpp +src/phqalloc.h +src/pitzer.cpp +src/pitzer_structures.cpp +src/prep.cpp +src/print.cpp +src/read.cpp +src/readtr.cpp +src/runner.cpp +src/runner.h +src/sit.cpp +src/smalldense.cpp +src/smalldense.h +src/spread.cpp +src/step.cpp +src/structures.cpp +src/sundialsmath.cpp +src/sundialsmath.h +src/sundialstypes.h +src/tally.cpp +src/tidy.cpp +src/transport.cpp +src/utilities.cpp +) + +option(PHRQC_USE_GMP "Use GNU Multiple Precision library" OFF) +if(PHRQC_USE_GMP) + find_path(GMP_INCLUDE_PATH gmp.h) + find_library(GMP_LIBRARY gmp) +else() + mark_as_advanced(FORCE GMP_INCLUDE_PATH GMP_LIBRARY) +endif() + +if(PHRQC_USE_GMP) + if(GMP_INCLUDE_PATH) + set(phreeqc_SOURCES ${phreeqc_SOURCES} src/cl1mp.cpp) + endif() +endif() + +option(PHRQC_TESTING "Set TESTING preprocessor definition" OFF) + +if(MSVC) + + # Copy Release to ClrRelease + SET(CMAKE_CXX_FLAGS_CLRRELEASE ${CMAKE_CXX_FLAGS_RELEASE} CACHE STRING + "Flags used by the C++ compiler during ClrRelease builds." + FORCE) + SET(CMAKE_C_FLAGS_CLRRELEASE ${CMAKE_C_FLAGS_RELEASE} CACHE STRING + "Flags used by the C compiler during ClrRelease builds." + FORCE) + SET(CMAKE_EXE_LINKER_FLAGS_CLRRELEASE + ${CMAKE_EXE_LINKER_FLAGS_RELEASE} CACHE STRING + "Flags used for linking binaries during ClrRelease builds." + FORCE) + SET(CMAKE_SHARED_LINKER_FLAGS_CLRRELEASE + ${CMAKE_SHARED_LINKER_FLAGS_RELEASE} CACHE STRING + "Flags used by the shared libraries linker during ClrRelease builds." + FORCE) + MARK_AS_ADVANCED( + CMAKE_CXX_FLAGS_CLRRELEASE + CMAKE_C_FLAGS_CLRRELEASE + CMAKE_EXE_LINKER_FLAGS_CLRRELEASE + CMAKE_SHARED_LINKER_FLAGS_CLRRELEASE ) + + + # Copy Debug to ClrDebug + SET(CMAKE_CXX_FLAGS_CLRDEBUG ${CMAKE_CXX_FLAGS_DEBUG} CACHE STRING + "Flags used by the C++ compiler during ClrDebug builds." + FORCE) + SET(CMAKE_C_FLAGS_CLRDEBUG ${CMAKE_C_FLAGS_DEBUG} CACHE STRING + "Flags used by the C compiler during ClrDebug builds." + FORCE) + SET(CMAKE_EXE_LINKER_FLAGS_CLRDEBUG + ${CMAKE_EXE_LINKER_FLAGS_DEBUG} CACHE STRING + "Flags used for linking binaries during ClrDebug builds." + FORCE) + SET(CMAKE_SHARED_LINKER_FLAGS_CLRDEBUG + ${CMAKE_SHARED_LINKER_FLAGS_DEBUG} CACHE STRING + "Flags used by the shared libraries linker during ClrDebug builds." + FORCE) + MARK_AS_ADVANCED( + CMAKE_CXX_FLAGS_CLRDEBUG + CMAKE_C_FLAGS_CLRDEBUG + CMAKE_EXE_LINKER_FLAGS_CLRDEBUG + CMAKE_SHARED_LINKER_FLAGS_CLRDEBUG ) + + + # Remove /EHsc from CMAKE_CXX_FLAGS + STRING(REPLACE " /EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) + STRING(REPLACE "/EHsc " "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) + SET(CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS}" CACHE STRING + "Flags used by the compiler during all build types." + FORCE) + + # Add /EHsc to CMAKE_CXX_FLAGS_RELEASE + STRING(REPLACE "/EHsc " "" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) + STRING(REPLACE " /EHsc" "" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) + SET(CMAKE_CXX_FLAGS_RELEASE + "/EHsc ${CMAKE_CXX_FLAGS_RELEASE}" CACHE STRING + "Flags used by the compiler during Release build types." + FORCE) + + # Add /EHsc to CMAKE_CXX_FLAGS_DEBUG + STRING(REPLACE "/EHsc " "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) + STRING(REPLACE " /EHsc" "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) + SET(CMAKE_CXX_FLAGS_DEBUG + "/EHsc ${CMAKE_CXX_FLAGS_DEBUG}" CACHE STRING + "Flags used by the compiler during Debug build types." + FORCE) + + # Add /EHa and /clr to CMAKE_CXX_FLAGS_CLRRELEASE + STRING(REPLACE "/EHsc " "" CMAKE_CXX_FLAGS_CLRRELEASE ${CMAKE_CXX_FLAGS_CLRRELEASE}) + STRING(REPLACE " /EHsc" "" CMAKE_CXX_FLAGS_CLRRELEASE ${CMAKE_CXX_FLAGS_CLRRELEASE}) + SET(CMAKE_CXX_FLAGS_CLRRELEASE + "-DMULTICHART /EHa ${CMAKE_CXX_FLAGS_CLRRELEASE} /clr" CACHE STRING + "Flags used by the compiler during ClrRelease builds." + FORCE) + + # Add /EHa and /clr to CMAKE_CXX_FLAGS_CLRDEBUG + STRING(REPLACE "/EHsc " "" CMAKE_CXX_FLAGS_CLRDEBUG ${CMAKE_CXX_FLAGS_CLRDEBUG}) + STRING(REPLACE " /EHsc" "" CMAKE_CXX_FLAGS_CLRDEBUG ${CMAKE_CXX_FLAGS_CLRDEBUG}) + STRING(REPLACE " /RTC1" " " CMAKE_CXX_FLAGS_CLRDEBUG "${CMAKE_CXX_FLAGS_CLRDEBUG}") + STRING(REPLACE "/RTC1 " " " CMAKE_CXX_FLAGS_CLRDEBUG "${CMAKE_CXX_FLAGS_CLRDEBUG}") + SET(CMAKE_CXX_FLAGS_CLRDEBUG + "-DMULTICHART /EHa ${CMAKE_CXX_FLAGS_CLRDEBUG} /clr" CACHE STRING + "Flags used by the compiler during ClrDebug builds." + FORCE) + + SET(CMAKE_CONFIGURATION_TYPES "Debug;Release;ClrDebug;ClrRelease" CACHE STRING + "Semicolon separated list of supported configuration types." + FORCE) +endif() + +add_executable(phreeqc ${phreeqc_SOURCES}) +set_target_properties(phreeqc PROPERTIES DEBUG_POSTFIX "d") + +target_compile_features(phreeqc PUBLIC cxx_std_11) + +# Add '#define TESTING' +if(PHRQC_TESTING) + target_compile_definitions(phreeqc PRIVATE TESTING) +endif() + +# force utf-8 on VS2015 and later +if(MSVC_VERSION GREATER_EQUAL 1900) + # https://learn.microsoft.com/en-us/cpp/preprocessor/predefined-macros?view=msvc-170 + target_compile_options(phreeqc PRIVATE "$<$:/utf-8>") + target_compile_options(phreeqc PRIVATE "$<$:/utf-8>") +endif() + +# Disable deprecation warnings for standard C and STL functions in VS2005 +# and later +if(MSVC_VERSION EQUAL 1400 OR MSVC_VERSION GREATER 1400) + target_compile_definitions(phreeqc PRIVATE _CRT_SECURE_NO_DEPRECATE) + target_compile_definitions(phreeqc PRIVATE _SCL_SECURE_NO_WARNINGS) +endif() + +# define DOS +if(WIN32) + target_compile_definitions(phreeqc PRIVATE DOS) + target_compile_definitions(phreeqc PRIVATE _CONSOLE) +endif() + +target_include_directories(phreeqc PRIVATE "${PROJECT_SOURCE_DIR}/src") +target_include_directories(phreeqc PRIVATE "${PROJECT_SOURCE_DIR}/src/common") +target_include_directories(phreeqc PRIVATE "${PROJECT_SOURCE_DIR}/src/PhreeqcKeywords") + +if(PHRQC_USE_GMP) + if(GMP_INCLUDE_PATH) + target_compile_definitions(phreeqc PRIVATE INVERSE_CL1MP) + target_include_directories(phreeqc PRIVATE "${GMP_INCLUDE_PATH}") + endif() + if(GMP_LIBRARY) + target_link_libraries(phreeqc ${GMP_LIBRARY}) + endif() +endif() + +if(WIN32) + install(TARGETS phreeqc DESTINATION "${CMAKE_INSTALL_BINDIR}/Release" CONFIGURATIONS Debug Release) + install(TARGETS phreeqc DESTINATION "${CMAKE_INSTALL_BINDIR}/ClrRelease" CONFIGURATIONS ClrDebug ClrRelease) +else() + install(TARGETS phreeqc DESTINATION "${CMAKE_INSTALL_BINDIR}") +endif() + +# tests +include(CTest) + +# subdirectories +add_subdirectory(database) +add_subdirectory(doc) +add_subdirectory(examples) +if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/mytest/CMakeLists.txt) + add_subdirectory(mytest) +endif() + + +# Setup references for /CLR +if(MSVC) + set_target_properties(phreeqc PROPERTIES VS_DOTNET_REFERENCES "System;System.Drawing;System.Windows.Forms;${CMAKE_CURRENT_SOURCE_DIR}/src/ZedGraph.dll") +endif() diff --git a/HTMLversion/CMakeLists.txt b/HTMLversion/CMakeLists.txt index c6696e0bb..d6c47f7f4 100644 --- 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 index f94b888be..031b71c52 100644 --- 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 index 8f3a3913d..822b6f251 100644 --- 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 diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4 new file mode 100644 index 000000000..8edf5152e --- /dev/null +++ b/m4/ax_cxx_compile_stdcxx.m4 @@ -0,0 +1,1018 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional]) +# +# DESCRIPTION +# +# Check for baseline language coverage in the compiler for the specified +# version of the C++ standard. If necessary, add switches to CXX and +# CXXCPP to enable support. VERSION may be '11', '14', '17', or '20' for +# the respective C++ standard version. +# +# The second argument, if specified, indicates whether you insist on an +# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. +# -std=c++11). If neither is specified, you get whatever works, with +# preference for no added switch, and then for an extended mode. +# +# The third argument, if specified 'mandatory' or if left unspecified, +# indicates that baseline support for the specified C++ standard is +# required and that the macro should error out if no mode with that +# support is found. If specified 'optional', then configuration proceeds +# regardless, after defining HAVE_CXX${VERSION} if and only if a +# supporting mode is found. +# +# LICENSE +# +# Copyright (c) 2008 Benjamin Kosnik +# Copyright (c) 2012 Zack Weinberg +# Copyright (c) 2013 Roy Stogner +# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov +# Copyright (c) 2015 Paul Norman +# Copyright (c) 2015 Moritz Klammler +# Copyright (c) 2016, 2018 Krzesimir Nowak +# Copyright (c) 2019 Enji Cooper +# Copyright (c) 2020 Jason Merrill +# Copyright (c) 2021 Jörn Heusipp +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 18 + +dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro +dnl (serial version number 13). + +AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl + m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"], + [$1], [14], [ax_cxx_compile_alternatives="14 1y"], + [$1], [17], [ax_cxx_compile_alternatives="17 1z"], + [$1], [20], [ax_cxx_compile_alternatives="20"], + [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl + m4_if([$2], [], [], + [$2], [ext], [], + [$2], [noext], [], + [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl + m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true], + [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true], + [$3], [optional], [ax_cxx_compile_cxx$1_required=false], + [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])]) + AC_LANG_PUSH([C++])dnl + ac_success=no + + m4_if([$2], [], [dnl + AC_CACHE_CHECK(whether $CXX supports C++$1 features by default, + ax_cv_cxx_compile_cxx$1, + [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], + [ax_cv_cxx_compile_cxx$1=yes], + [ax_cv_cxx_compile_cxx$1=no])]) + if test x$ax_cv_cxx_compile_cxx$1 = xyes; then + ac_success=yes + fi]) + + m4_if([$2], [noext], [], [dnl + if test x$ac_success = xno; then + for alternative in ${ax_cxx_compile_alternatives}; do + switch="-std=gnu++${alternative}" + cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) + AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, + $cachevar, + [ac_save_CXX="$CXX" + CXX="$CXX $switch" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], + [eval $cachevar=yes], + [eval $cachevar=no]) + CXX="$ac_save_CXX"]) + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + fi]) + + m4_if([$2], [ext], [], [dnl + if test x$ac_success = xno; then + dnl HP's aCC needs +std=c++11 according to: + dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf + dnl Cray's crayCC needs "-h std=c++11" + dnl MSVC needs -std:c++NN for C++17 and later (default is C++14) + for alternative in ${ax_cxx_compile_alternatives}; do + for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}" MSVC; do + if test x"$switch" = xMSVC; then + dnl AS_TR_SH maps both `:` and `=` to `_` so -std:c++17 would collide + dnl with -std=c++17. We suffix the cache variable name with _MSVC to + dnl avoid this. + switch=-std:c++${alternative} + cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_${switch}_MSVC]) + else + cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) + fi + AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, + $cachevar, + [ac_save_CXX="$CXX" + CXX="$CXX $switch" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], + [eval $cachevar=yes], + [eval $cachevar=no]) + CXX="$ac_save_CXX"]) + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + if test x$ac_success = xyes; then + break + fi + done + fi]) + AC_LANG_POP([C++]) + if test x$ax_cxx_compile_cxx$1_required = xtrue; then + if test x$ac_success = xno; then + AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.]) + fi + fi + if test x$ac_success = xno; then + HAVE_CXX$1=0 + AC_MSG_NOTICE([No compiler with C++$1 support was found]) + else + HAVE_CXX$1=1 + AC_DEFINE(HAVE_CXX$1,1, + [define if the compiler supports basic C++$1 syntax]) + fi + AC_SUBST(HAVE_CXX$1) +]) + + +dnl Test body for checking C++11 support + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 +) + +dnl Test body for checking C++14 support + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 +) + +dnl Test body for checking C++17 support + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_17 +) + +dnl Test body for checking C++20 support + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_20], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_17 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_20 +) + + +dnl Tests for new features in C++11 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[ + +// If the compiler admits that it is not ready for C++11, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +// MSVC always sets __cplusplus to 199711L in older versions; newer versions +// only set it correctly if /Zc:__cplusplus is specified as well as a +// /std:c++NN switch: +// https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/ +#elif __cplusplus < 201103L && !defined _MSC_VER + +#error "This is not a C++11 compiler" + +#else + +namespace cxx11 +{ + + namespace test_static_assert + { + + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + } + + namespace test_final_override + { + + struct Base + { + virtual ~Base() {} + virtual void f() {} + }; + + struct Derived : public Base + { + virtual ~Derived() override {} + virtual void f() override {} + }; + + } + + namespace test_double_right_angle_brackets + { + + template < typename T > + struct check {}; + + typedef check single_type; + typedef check> double_type; + typedef check>> triple_type; + typedef check>>> quadruple_type; + + } + + namespace test_decltype + { + + int + f() + { + int a = 1; + decltype(a) b = 2; + return a + b; + } + + } + + namespace test_type_deduction + { + + template < typename T1, typename T2 > + struct is_same + { + static const bool value = false; + }; + + template < typename T > + struct is_same + { + static const bool value = true; + }; + + template < typename T1, typename T2 > + auto + add(T1 a1, T2 a2) -> decltype(a1 + a2) + { + return a1 + a2; + } + + int + test(const int c, volatile int v) + { + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == false, ""); + auto ac = c; + auto av = v; + auto sumi = ac + av + 'x'; + auto sumf = ac + av + 1.0; + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == true, ""); + return (sumf > 0.0) ? sumi : add(c, v); + } + + } + + namespace test_noexcept + { + + int f() { return 0; } + int g() noexcept { return 0; } + + static_assert(noexcept(f()) == false, ""); + static_assert(noexcept(g()) == true, ""); + + } + + namespace test_constexpr + { + + template < typename CharT > + unsigned long constexpr + strlen_c_r(const CharT *const s, const unsigned long acc) noexcept + { + return *s ? strlen_c_r(s + 1, acc + 1) : acc; + } + + template < typename CharT > + unsigned long constexpr + strlen_c(const CharT *const s) noexcept + { + return strlen_c_r(s, 0UL); + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("1") == 1UL, ""); + static_assert(strlen_c("example") == 7UL, ""); + static_assert(strlen_c("another\0example") == 7UL, ""); + + } + + namespace test_rvalue_references + { + + template < int N > + struct answer + { + static constexpr int value = N; + }; + + answer<1> f(int&) { return answer<1>(); } + answer<2> f(const int&) { return answer<2>(); } + answer<3> f(int&&) { return answer<3>(); } + + void + test() + { + int i = 0; + const int c = 0; + static_assert(decltype(f(i))::value == 1, ""); + static_assert(decltype(f(c))::value == 2, ""); + static_assert(decltype(f(0))::value == 3, ""); + } + + } + + namespace test_uniform_initialization + { + + struct test + { + static const int zero {}; + static const int one {1}; + }; + + static_assert(test::zero == 0, ""); + static_assert(test::one == 1, ""); + + } + + namespace test_lambdas + { + + void + test1() + { + auto lambda1 = [](){}; + auto lambda2 = lambda1; + lambda1(); + lambda2(); + } + + int + test2() + { + auto a = [](int i, int j){ return i + j; }(1, 2); + auto b = []() -> int { return '0'; }(); + auto c = [=](){ return a + b; }(); + auto d = [&](){ return c; }(); + auto e = [a, &b](int x) mutable { + const auto identity = [](int y){ return y; }; + for (auto i = 0; i < a; ++i) + a += b--; + return x + identity(a + b); + }(0); + return a + b + c + d + e; + } + + int + test3() + { + const auto nullary = [](){ return 0; }; + const auto unary = [](int x){ return x; }; + using nullary_t = decltype(nullary); + using unary_t = decltype(unary); + const auto higher1st = [](nullary_t f){ return f(); }; + const auto higher2nd = [unary](nullary_t f1){ + return [unary, f1](unary_t f2){ return f2(unary(f1())); }; + }; + return higher1st(nullary) + higher2nd(nullary)(unary); + } + + } + + namespace test_variadic_templates + { + + template + struct sum; + + template + struct sum + { + static constexpr auto value = N0 + sum::value; + }; + + template <> + struct sum<> + { + static constexpr auto value = 0; + }; + + static_assert(sum<>::value == 0, ""); + static_assert(sum<1>::value == 1, ""); + static_assert(sum<23>::value == 23, ""); + static_assert(sum<1, 2>::value == 3, ""); + static_assert(sum<5, 5, 11>::value == 21, ""); + static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); + + } + + // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae + // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function + // because of this. + namespace test_template_alias_sfinae + { + + struct foo {}; + + template + using member = typename T::member_type; + + template + void func(...) {} + + template + void func(member*) {} + + void test(); + + void test() { func(0); } + + } + +} // namespace cxx11 + +#endif // __cplusplus >= 201103L + +]]) + + +dnl Tests for new features in C++14 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[ + +// If the compiler admits that it is not ready for C++14, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201402L && !defined _MSC_VER + +#error "This is not a C++14 compiler" + +#else + +namespace cxx14 +{ + + namespace test_polymorphic_lambdas + { + + int + test() + { + const auto lambda = [](auto&&... args){ + const auto istiny = [](auto x){ + return (sizeof(x) == 1UL) ? 1 : 0; + }; + const int aretiny[] = { istiny(args)... }; + return aretiny[0]; + }; + return lambda(1, 1L, 1.0f, '1'); + } + + } + + namespace test_binary_literals + { + + constexpr auto ivii = 0b0000000000101010; + static_assert(ivii == 42, "wrong value"); + + } + + namespace test_generalized_constexpr + { + + template < typename CharT > + constexpr unsigned long + strlen_c(const CharT *const s) noexcept + { + auto length = 0UL; + for (auto p = s; *p; ++p) + ++length; + return length; + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("x") == 1UL, ""); + static_assert(strlen_c("test") == 4UL, ""); + static_assert(strlen_c("another\0test") == 7UL, ""); + + } + + namespace test_lambda_init_capture + { + + int + test() + { + auto x = 0; + const auto lambda1 = [a = x](int b){ return a + b; }; + const auto lambda2 = [a = lambda1(x)](){ return a; }; + return lambda2(); + } + + } + + namespace test_digit_separators + { + + constexpr auto ten_million = 100'000'000; + static_assert(ten_million == 100000000, ""); + + } + + namespace test_return_type_deduction + { + + auto f(int& x) { return x; } + decltype(auto) g(int& x) { return x; } + + template < typename T1, typename T2 > + struct is_same + { + static constexpr auto value = false; + }; + + template < typename T > + struct is_same + { + static constexpr auto value = true; + }; + + int + test() + { + auto x = 0; + static_assert(is_same::value, ""); + static_assert(is_same::value, ""); + return x; + } + + } + +} // namespace cxx14 + +#endif // __cplusplus >= 201402L + +]]) + + +dnl Tests for new features in C++17 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[ + +// If the compiler admits that it is not ready for C++17, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201703L && !defined _MSC_VER + +#error "This is not a C++17 compiler" + +#else + +#include +#include +#include + +namespace cxx17 +{ + + namespace test_constexpr_lambdas + { + + constexpr int foo = [](){return 42;}(); + + } + + namespace test::nested_namespace::definitions + { + + } + + namespace test_fold_expression + { + + template + int multiply(Args... args) + { + return (args * ... * 1); + } + + template + bool all(Args... args) + { + return (args && ...); + } + + } + + namespace test_extended_static_assert + { + + static_assert (true); + + } + + namespace test_auto_brace_init_list + { + + auto foo = {5}; + auto bar {5}; + + static_assert(std::is_same, decltype(foo)>::value); + static_assert(std::is_same::value); + } + + namespace test_typename_in_template_template_parameter + { + + template typename X> struct D; + + } + + namespace test_fallthrough_nodiscard_maybe_unused_attributes + { + + int f1() + { + return 42; + } + + [[nodiscard]] int f2() + { + [[maybe_unused]] auto unused = f1(); + + switch (f1()) + { + case 17: + f1(); + [[fallthrough]]; + case 42: + f1(); + } + return f1(); + } + + } + + namespace test_extended_aggregate_initialization + { + + struct base1 + { + int b1, b2 = 42; + }; + + struct base2 + { + base2() { + b3 = 42; + } + int b3; + }; + + struct derived : base1, base2 + { + int d; + }; + + derived d1 {{1, 2}, {}, 4}; // full initialization + derived d2 {{}, {}, 4}; // value-initialized bases + + } + + namespace test_general_range_based_for_loop + { + + struct iter + { + int i; + + int& operator* () + { + return i; + } + + const int& operator* () const + { + return i; + } + + iter& operator++() + { + ++i; + return *this; + } + }; + + struct sentinel + { + int i; + }; + + bool operator== (const iter& i, const sentinel& s) + { + return i.i == s.i; + } + + bool operator!= (const iter& i, const sentinel& s) + { + return !(i == s); + } + + struct range + { + iter begin() const + { + return {0}; + } + + sentinel end() const + { + return {5}; + } + }; + + void f() + { + range r {}; + + for (auto i : r) + { + [[maybe_unused]] auto v = i; + } + } + + } + + namespace test_lambda_capture_asterisk_this_by_value + { + + struct t + { + int i; + int foo() + { + return [*this]() + { + return i; + }(); + } + }; + + } + + namespace test_enum_class_construction + { + + enum class byte : unsigned char + {}; + + byte foo {42}; + + } + + namespace test_constexpr_if + { + + template + int f () + { + if constexpr(cond) + { + return 13; + } + else + { + return 42; + } + } + + } + + namespace test_selection_statement_with_initializer + { + + int f() + { + return 13; + } + + int f2() + { + if (auto i = f(); i > 0) + { + return 3; + } + + switch (auto i = f(); i + 4) + { + case 17: + return 2; + + default: + return 1; + } + } + + } + + namespace test_template_argument_deduction_for_class_templates + { + + template + struct pair + { + pair (T1 p1, T2 p2) + : m1 {p1}, + m2 {p2} + {} + + T1 m1; + T2 m2; + }; + + void f() + { + [[maybe_unused]] auto p = pair{13, 42u}; + } + + } + + namespace test_non_type_auto_template_parameters + { + + template + struct B + {}; + + B<5> b1; + B<'a'> b2; + + } + + namespace test_structured_bindings + { + + int arr[2] = { 1, 2 }; + std::pair pr = { 1, 2 }; + + auto f1() -> int(&)[2] + { + return arr; + } + + auto f2() -> std::pair& + { + return pr; + } + + struct S + { + int x1 : 2; + volatile double y1; + }; + + S f3() + { + return {}; + } + + auto [ x1, y1 ] = f1(); + auto& [ xr1, yr1 ] = f1(); + auto [ x2, y2 ] = f2(); + auto& [ xr2, yr2 ] = f2(); + const auto [ x3, y3 ] = f3(); + + } + + namespace test_exception_spec_type_system + { + + struct Good {}; + struct Bad {}; + + void g1() noexcept; + void g2(); + + template + Bad + f(T*, T*); + + template + Good + f(T1*, T2*); + + static_assert (std::is_same_v); + + } + + namespace test_inline_variables + { + + template void f(T) + {} + + template inline T g(T) + { + return T{}; + } + + template<> inline void f<>(int) + {} + + template<> int g<>(int) + { + return 5; + } + + } + +} // namespace cxx17 + +#endif // __cplusplus < 201703L && !defined _MSC_VER + +]]) + + +dnl Tests for new features in C++20 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_20], [[ + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 202002L && !defined _MSC_VER + +#error "This is not a C++20 compiler" + +#else + +#include + +namespace cxx20 +{ + +// As C++20 supports feature test macros in the standard, there is no +// immediate need to actually test for feature availability on the +// Autoconf side. + +} // namespace cxx20 + +#endif // __cplusplus < 202002L && !defined _MSC_VER + +]]) diff --git a/src/Phreeqc.h b/src/Phreeqc.h index f03f468ca..7a1e7e9fe 100644 --- a/src/Phreeqc.h +++ b/src/Phreeqc.h @@ -2096,12 +2096,22 @@ char* _string_duplicate(const char* token, const char* szFileName, int nLine); // https://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010 #if defined(_MSC_VER) && (_MSC_VER < 1900) - +#if (_MSC_VER <= 1700) // VS2012 +namespace std { + __inline bool isnan(double num) { + return _isnan(num) != 0; + } +} +#endif #include #define snprintf c99_snprintf #define vsnprintf c99_vsnprintf +#pragma warning( push ) +// warning C4793: 'vararg' : causes native code generation +#pragma warning( disable : 4793 ) + __inline int c99_vsnprintf(char *outBuf, size_t size, const char *format, va_list ap) { int count = -1; @@ -2125,6 +2135,7 @@ __inline int c99_snprintf(char *outBuf, size_t size, const char *format, ...) return count; } +#pragma warning( pop ) #endif // defined(_MSC_VER) && (_MSC_VER < 1900) #endif //_INC_MISSING_SNPRINTF_H diff --git a/src/common/Utils.cxx b/src/common/Utils.cxx index 1eafd4399..0e8d461ae 100644 --- a/src/common/Utils.cxx +++ b/src/common/Utils.cxx @@ -12,6 +12,10 @@ #include "float.h" #include +#if defined(_MSC_VER) && (_MSC_VER <= 1400) // VS2005 +# define nullptr NULL +#endif + #if defined(PHREEQCI_GUI) #ifdef _DEBUG #define new DEBUG_NEW diff --git a/src/global_structures.h b/src/global_structures.h index bf468b71e..e9d82f9d3 100644 --- a/src/global_structures.h +++ b/src/global_structures.h @@ -6,9 +6,15 @@ * #define DEFINITIONS * ---------------------------------------------------------------------- */ #if !defined(NAN) -#define NAN nan("1") +# if defined(_MSC_VER) && (_MSC_VER <= 1700) // VS2012 +// https://learn.microsoft.com/en-us/cpp/preprocessor/predefined-macros?view=msvc-170 +# include +# define NAN std::numeric_limits::signaling_NaN() +# else +# define NAN nan("1") +# endif #endif -#define MISSING -9999.999 +#define MISSING -9999.999 #include "NA.h" /* NA = not available */ #define F_C_MOL 96493.5 /* C/mol or joule/volt-eq */