Update dependencies (#195)

Author: awvwgk

config/cmake/Findmctc-lib.cmake

@@ -17,7 +17,7 @@
 set(_lib "mctc-lib")
 set(_pkg "MCTCLIB")
 set(_url "https://github.com/grimme-lab/mctc-lib")
-set(_rev "v0.4.1")
+set(_rev "v0.5.2")
 
 if(NOT DEFINED "${_pkg}_FIND_METHOD")
   if(DEFINED "${PROJECT_NAME}-dependency-method")

config/cmake/Findtoml-f.cmake

@@ -17,7 +17,7 @@
 set(_lib "toml-f")
 set(_pkg "TOMLF")
 set(_url "https://github.com/toml-f/toml-f")
-set(_rev "v0.4.2")
+set(_rev "v0.5.1")
 
 if(NOT DEFINED "${_pkg}_FIND_METHOD")
   if(DEFINED "${PROJECT_NAME}-dependency-method")

config/cmake/s-dftd3-utils.cmake

@@ -75,8 +75,10 @@ macro(
           "${${_pkg_uc}_BINARY_DIR}"
         )
 
-        add_library("${package}::${package}" INTERFACE IMPORTED)
-        target_link_libraries("${package}::${package}" INTERFACE "${package}")
+        if(NOT TARGET "${package}::${package}")
+          add_library("${package}::${package}" INTERFACE IMPORTED)
+          target_link_libraries("${package}::${package}" INTERFACE "${package}")
+        endif()
 
         # We need the module directory in the subproject before we finish the configure stage
         if(NOT EXISTS "${${_pkg_uc}_BINARY_DIR}/include")
@@ -97,8 +99,10 @@ macro(
       )
       FetchContent_MakeAvailable("${_pkg_lc}")
 
-      add_library("${package}::${package}" INTERFACE IMPORTED)
-      target_link_libraries("${package}::${package}" INTERFACE "${package}")
+      if(NOT TARGET "${package}::${package}")
+        add_library("${package}::${package}" INTERFACE IMPORTED)
+        target_link_libraries("${package}::${package}" INTERFACE "${package}")
+      endif()
 
       # We need the module directory in the subproject before we finish the configure stage
       FetchContent_GetProperties("${_pkg_lc}" BINARY_DIR "${_pkg_uc}_BINARY_DIR")

config/template-config.cmake

@@ -5,9 +5,8 @@ set("SDFTD3_WITH_OpenMP" @SDFTD3_WITH_OpenMP@)
 set("SDFTD3_USE_MCTCLIB" @SDFTD3_USE_MCTCLIB@)
 
 if(NOT TARGET "@PROJECT_NAME@::@PROJECT_NAME@")
-  include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake")
-
   include(CMakeFindDependencyMacro)
+  list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
 
   if(NOT TARGET "OpenMP::OpenMP_Fortran" AND SDFTD3_WITH_OpenMP)
     find_dependency("OpenMP")
@@ -16,4 +15,7 @@ if(NOT TARGET "@PROJECT_NAME@::@PROJECT_NAME@")
   if(NOT TARGET "mctc-lib::mctc-lib" AND SDFTD3_USE_MCTCLIB)
     find_dependency("mctc-lib")
   endif()
+
+  list(REMOVE_AT CMAKE_MODULE_PATH -1)
+  include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake")
 endif()

fpm.toml

@@ -9,7 +9,7 @@ keywords = ["dispersion-correction", "quantum-chemistry"]
 
 [dependencies]
 mctc-lib.git = "https://github.com/grimme-lab/mctc-lib"
-mctc-lib.tag = "v0.5.0"
+mctc-lib.tag = "v0.5.2"
 
 [dev-dependencies]
 mstore.git = "https://github.com/grimme-lab/mstore"
@@ -21,6 +21,7 @@ auto-tests = false
 [[executable]]
 name = "s-dftd3"
 dependencies.toml-f.git = "https://github.com/toml-f/toml-f"
+dependencies.toml-f.tag = "v0.5.1"
 
 [[test]]
 name = "tester"

subprojects/mctc-lib.wrap

@@ -1,4 +1,4 @@
 [wrap-git]
 directory = mctc-lib
 url = https://github.com/grimme-lab/mctc-lib
-revision = v0.5.1
+revision = v0.5.2

subprojects/toml-f.wrap

@@ -1,4 +1,4 @@
 [wrap-git]
 directory = toml-f
 url = https://github.com/toml-f/toml-f
-revision = v0.5.0
+revision = v0.5.1