From a608afe7f7ae53716ab37478558c8c1f9d2be804 Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Tue, 9 Feb 2021 17:08:05 +0100 Subject: [PATCH] [CPM] Moved into own file. --- CMakeLists.txt | 1 + scripts/cmake/Dependencies.cmake | 84 +++++++++++++++++++++++++++++++ scripts/cmake/Find.cmake | 85 -------------------------------- 3 files changed, 85 insertions(+), 85 deletions(-) create mode 100644 scripts/cmake/Dependencies.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index ca7f131605a..4c87a0b27ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,6 +85,7 @@ include(Functions) include(ConanSetup) include(CompilerSetup) include(Find) +include(Dependencies) include(CCacheSetup) include(CLCacheSetup) include(DocumentationSetup) diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake new file mode 100644 index 00000000000..c2b9e2d7a75 --- /dev/null +++ b/scripts/cmake/Dependencies.cmake @@ -0,0 +1,84 @@ +if(BUILD_TESTING) + CPMAddPackage( + NAME googletest + GITHUB_REPOSITORY google/googletest + GIT_TAG 389cb68b87193358358ae87cc56d257fd0d80189 + OPTIONS + "INSTALL_GTEST OFF" + "gtest_force_shared_crt ON" + ) + + CPMAddPackage( + NAME autocheck + GITHUB_REPOSITORY ufz/autocheck + GIT_TAG e388ecbb31c49fc2724c8d0436da313b6edca7fd + DOWNLOAD_ONLY YES + ) + if(autocheck_ADDED) + add_library(autocheck INTERFACE IMPORTED) + target_include_directories(autocheck INTERFACE ${autocheck_SOURCE_DIR}/include) + endif() + + CPMAddPackage( + NAME vtkdiff + GITHUB_REPOSITORY ufz/vtkdiff + GIT_TAG 49403cee266bb8e80405a02d677dbb5f71afc61a + OPTIONS + "VTK_LIBRARIES vtkIOXML" + ) + if(vtkdiff_ADDED) + install(PROGRAMS $<TARGET_FILE:vtkdiff> DESTINATION bin) + 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() + +CPMAddPackage( + NAME spdlog + GITHUB_REPOSITORY gabime/spdlog + VERSION 1.8.2 +) + +CPMAddPackage( + NAME tclap + GITHUB_REPOSITORY ufz/tclap + GIT_TAG 03abc3a3327214137c6ffd5b9a6efe23f0927cc2 + DOWNLOAD_ONLY YES +) +if(tclap_ADDED) + add_library(tclap INTERFACE IMPORTED) + target_include_directories(tclap INTERFACE ${tclap_SOURCE_DIR}/include) +endif() + +CPMAddPackage( + NAME tetgen + GITHUB_REPOSITORY ufz/tetgen + GIT_TAG 603ba181ebfaed38eec88532720e282606009b73 +) +if(tetgen_ADDED) + install(PROGRAMS $<TARGET_FILE:tetgen> DESTINATION bin) +endif() + +if(OGS_USE_PYTHON) + CPMAddPackage( + NAME pybind11 + GITHUB_REPOSITORY pybind/pybind11 + GIT_TAG f1abf5d9159b805674197f6bc443592e631c9130 + # pybind11 uses old CMake find functionality, pass variables to use + # the same Python installation. + OPTIONS + "PYTHON_INCLUDE_DIR ${Python3_INCLUDE_DIRS}" + "PYTHON_LIBRARIES ${Python3_LIBRARIES}" + "PYTHON_EXECUTABLE ${Python3_EXECUTABLE}" + "PYBIND11_PYTHON_VERSION ${Python3_VERSION}" + ) +endif() diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake index e9e5fbd09fc..f49ae383344 100644 --- a/scripts/cmake/Find.cmake +++ b/scripts/cmake/Find.cmake @@ -1,88 +1,3 @@ -if(BUILD_TESTING) - CPMAddPackage( - NAME googletest - GITHUB_REPOSITORY google/googletest - GIT_TAG 389cb68b87193358358ae87cc56d257fd0d80189 - OPTIONS - "INSTALL_GTEST OFF" - "gtest_force_shared_crt ON" - ) - - CPMAddPackage( - NAME autocheck - GITHUB_REPOSITORY ufz/autocheck - GIT_TAG e388ecbb31c49fc2724c8d0436da313b6edca7fd - DOWNLOAD_ONLY YES - ) - if(autocheck_ADDED) - add_library(autocheck INTERFACE IMPORTED) - target_include_directories(autocheck INTERFACE ${autocheck_SOURCE_DIR}/include) - endif() - - CPMAddPackage( - NAME vtkdiff - GITHUB_REPOSITORY ufz/vtkdiff - GIT_TAG 49403cee266bb8e80405a02d677dbb5f71afc61a - OPTIONS - "VTK_LIBRARIES vtkIOXML" - ) - if(vtkdiff_ADDED) - install(PROGRAMS $<TARGET_FILE:vtkdiff> DESTINATION bin) - 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() - -CPMAddPackage( - NAME spdlog - GITHUB_REPOSITORY gabime/spdlog - VERSION 1.8.2 -) - -CPMAddPackage( - NAME tclap - GITHUB_REPOSITORY ufz/tclap - GIT_TAG 03abc3a3327214137c6ffd5b9a6efe23f0927cc2 - DOWNLOAD_ONLY YES -) -if(tclap_ADDED) - add_library(tclap INTERFACE IMPORTED) - target_include_directories(tclap INTERFACE ${tclap_SOURCE_DIR}/include) -endif() - -CPMAddPackage( - NAME tetgen - GITHUB_REPOSITORY ufz/tetgen - GIT_TAG 603ba181ebfaed38eec88532720e282606009b73 -) -if(tetgen_ADDED) - install(PROGRAMS $<TARGET_FILE:tetgen> DESTINATION bin) -endif() - -if(OGS_USE_PYTHON) - CPMAddPackage( - NAME pybind11 - GITHUB_REPOSITORY pybind/pybind11 - GIT_TAG f1abf5d9159b805674197f6bc443592e631c9130 - # pybind11 uses old CMake find functionality, pass variables to use - # the same Python installation. - OPTIONS - "PYTHON_INCLUDE_DIR ${Python3_INCLUDE_DIRS}" - "PYTHON_LIBRARIES ${Python3_LIBRARIES}" - "PYTHON_EXECUTABLE ${Python3_EXECUTABLE}" - "PYBIND11_PYTHON_VERSION ${Python3_VERSION}" - ) -endif() - ###################### ### Find tools ### ###################### -- GitLab