Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/cmake/Findjonquil.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
set(_lib "jonquil")
set(_pkg "JONQUIL")
set(_url "https://github.com/toml-f/jonquil")
set(_rev "v0.3.0")
set(_rev "v0.3.1")

if(NOT DEFINED "${_pkg}_FIND_METHOD")
if(DEFINED "${PROJECT_NAME}-dependency-method")
Expand Down
2 changes: 1 addition & 1 deletion config/cmake/Findtoml-f.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
set(_lib "toml-f")
set(_pkg "TOMLF")
set(_url "https://github.com/toml-f/toml-f")
set(_rev "v0.4.3")
set(_rev "v0.5.1")

if(NOT DEFINED "${_pkg}_FIND_METHOD")
if(DEFINED "${PROJECT_NAME}-dependency-method")
Expand Down
12 changes: 8 additions & 4 deletions config/cmake/mctc-utils.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,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")
Expand All @@ -91,8 +93,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")
Expand Down
4 changes: 2 additions & 2 deletions fpm.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ keywords = ["computational-chemistry", "io"]

[dependencies]
jonquil.git = "https://github.com/toml-f/jonquil.git"
jonquil.tag = "v0.3.0"
jonquil.tag = "v0.3.1"
toml-f.git = "https://github.com/toml-f/toml-f.git"
toml-f.tag = "v0.4.3"
toml-f.tag = "v0.5.1"

[[executable]]
name = "mctc-convert"
Expand Down
2 changes: 1 addition & 1 deletion subprojects/jonquil.wrap
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[wrap-git]
directory = jonquil
url = https://github.com/toml-f/jonquil
revision = v0.3.0
revision = v0.3.1
2 changes: 1 addition & 1 deletion subprojects/toml-f.wrap
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[wrap-git]
directory = toml-f
url = https://github.com/toml-f/toml-f
revision = v0.4.3
revision = v0.5.1
Loading