diff --git a/.guix/modules/ogs-package.scm b/.guix/modules/ogs-package.scm index 8ceff8b6660..215ec2814fc 100644 --- a/.guix/modules/ogs-package.scm +++ b/.guix/modules/ogs-package.scm @@ -19,6 +19,7 @@ #:use-module (guix) #:use-module (guix packages) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) @@ -70,6 +71,7 @@ #:cmake ,cmake)) ;for newer CMake version (inputs (list boost eigen + exprtk hdf5 iphreeqc json-modern-cxx @@ -281,6 +283,27 @@ `(#:tests? #f) ))) +(define exprtk + (package + (name "exprtk") + (home-page "https://www.partow.net/programming/exprtk/index.html") + (synopsis "C++ Mathematical Expression Parsing And Evaluation Library") + (description "") + (license license:expat) + (version "0.0.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ArashPartow/exprtk.git") + (commit version))) + (sha256 + (base32 + "1w92qlfjpcan38d88fak3avq81lkcpai5mqpbvrsfv04mi5nfpk5")))) + (build-system copy-build-system) + (arguments + '(#:install-plan '(("exprtk.hpp" "include/"))) + ))) + ;; return package ogs diff --git a/ThirdParty/collection b/ThirdParty/collection index 860959625e7..a6070238d6c 160000 --- a/ThirdParty/collection +++ b/ThirdParty/collection @@ -1 +1 @@ -Subproject commit 860959625e7d9500c9ddb6e7b5b8af04a8a8744e +Subproject commit a6070238d6c9561a1fac03c93b1f20f248683155 diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake index e42bab97b38..0e9b026ebeb 100644 --- a/scripts/cmake/Dependencies.cmake +++ b/scripts/cmake/Dependencies.cmake @@ -282,15 +282,19 @@ endif() # find_package(ParaView REQUIRED) # endif() # ~~~ -CPMAddPackage( - NAME exprtk - GIT_REPOSITORY https://gitlab.opengeosys.org/ogs/libs/exprtk.git - GIT_TAG 2a5c62b93c9661470e69be572f22d821308b6f61 - DOWNLOAD_ONLY YES -) -if(exprtk_ADDED) +if(GUIX_BUILD) add_library(exprtk INTERFACE IMPORTED) - target_include_directories(exprtk SYSTEM INTERFACE ${exprtk_SOURCE_DIR}) +else() + CPMAddPackage( + NAME exprtk + GIT_REPOSITORY https://gitlab.opengeosys.org/ogs/libs/exprtk.git + GIT_TAG 2a5c62b93c9661470e69be572f22d821308b6f61 + DOWNLOAD_ONLY YES + ) + if(exprtk_ADDED) + add_library(exprtk INTERFACE IMPORTED) + target_include_directories(exprtk SYSTEM INTERFACE ${exprtk_SOURCE_DIR}) + endif() endif() if(GUIX_BUILD)