diff --git a/.gitmodules b/.gitmodules index cf30111f2fbaa67f2f34074eafc67606a638ecb3..3b307a1f1689a9d9955ee11ca94297e1329ab3f6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,9 +19,6 @@ [submodule "ThirdParty/pybind11"] path = ThirdParty/pybind11 url = https://github.com/pybind/pybind11.git -[submodule "ThirdParty/exprtk"] - path = ThirdParty/exprtk - url = https://github.com/ArashPartow/exprtk.git [submodule "ThirdParty/iphreeqc/src"] path = ThirdParty/iphreeqc/src url = https://github.com/ufz/iphreeqc.git diff --git a/CMakeLists.txt b/CMakeLists.txt index f08928fa9dcae944a145b8716ed2a3a690f24a93..fa190f6a192a43d49f7b4c0fff426884a0c87408 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -225,7 +225,6 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/tclap/include ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/json/include - ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/exprtk ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/spdlog/include) # vtkdiff diff --git a/ParameterLib/CMakeLists.txt b/ParameterLib/CMakeLists.txt index de2dcb6bd4d4ae9dd463d98089bb43a0e97f5861..d2f0d3a199506bf7abe0096b5267c18c3466c110 100644 --- a/ParameterLib/CMakeLists.txt +++ b/ParameterLib/CMakeLists.txt @@ -1,10 +1,11 @@ -# Source files get_source_files(SOURCES) - ogs_add_library(ParameterLib ${SOURCES}) include(GenerateExportHeader) generate_export_header(ParameterLib) target_include_directories(ParameterLib PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) -target_link_libraries(ParameterLib PUBLIC MathLib PRIVATE BaseLib MeshLib spdlog::spdlog) +target_link_libraries(ParameterLib + PUBLIC MathLib + PRIVATE BaseLib exprtk MeshLib spdlog::spdlog +) diff --git a/ThirdParty/exprtk b/ThirdParty/exprtk deleted file mode 160000 index d312ba91419c9cb12c8279fd3a19096d39dfcb5e..0000000000000000000000000000000000000000 --- a/ThirdParty/exprtk +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d312ba91419c9cb12c8279fd3a19096d39dfcb5e diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake index 8ca90b6259f04d20324c16889681bf68c35d90cb..b788ebd5614698d2c68306cf2f2ea47aa5dd9ec4 100644 --- a/scripts/cmake/Find.cmake +++ b/scripts/cmake/Find.cmake @@ -21,6 +21,17 @@ if(BUILD_TESTING) endif() endif() +CPMAddPackage( + NAME exprtk + GITHUB_REPOSITORY ArashPartow/exprtk + GIT_TAG c7c219480d9678eec7383a4a99030683c4a84d91 + DOWNLOAD_ONLY YES +) +if(exprtk_ADDED) + add_library(exprtk INTERFACE IMPORTED) + target_include_directories(exprtk INTERFACE ${exprtk_SOURCE_DIR}) +endif() + ###################### ### Find tools ### ###################### diff --git a/scripts/cmake/SubmoduleSetup.cmake b/scripts/cmake/SubmoduleSetup.cmake index bf11534fb1e445ace6372e7a0dcd16e7f0bb8051..bdd7f6a570a101f6c37af1bbe894be18aa0bc060 100644 --- a/scripts/cmake/SubmoduleSetup.cmake +++ b/scripts/cmake/SubmoduleSetup.cmake @@ -10,7 +10,6 @@ if(NOT OGS_ADDITIONAL_SUBMODULES_TO_CHECKOUT) endif() set(REQUIRED_SUBMODULES ThirdParty/cmake-modules - ThirdParty/exprtk ThirdParty/iphreeqc/src ThirdParty/json-cmake ThirdParty/spdlog