Skip to content

Small cmake cleanup #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Luthaf merged 3 commits into from
Jun 6, 2025
Merged

Small cmake cleanup #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a7758a
metatomic-torch does need to directly link to the metatensor target
Luthaf May 21, 2025
52386b9
CMake 3.18 can use FetchContent_MakeAvailable as long as there is no …
Luthaf May 21, 2025
d1160ef
Update readme
Luthaf May 22, 2025
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ For details, tutorials, and examples, please have a look at our

## Contributors

Thanks goes to all people that make metatensor possible:
Thanks goes to all people that make metatomic possible:

[![contributors list](https://contrib.rocks/image?repo=metatensor/metatomic)](https://github.com/metatensor/metatomic/graphs/contributors)

Expand Down
14 changes: 2 additions & 12 deletions metatomic-torch/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@ if (TARGET metatensor_torch)
check_compatible_versions(${METATENSOR_TORCH_BUILD_VERSION} ${REQUIRED_METATENSOR_TORCH_VERSION})
else()
find_package(metatensor_torch ${REQUIRED_METATENSOR_TORCH_VERSION} CONFIG REQUIRED)
# No version specification here, we'll use whatever `metatensor_torch` uses
find_package(metatensor CONFIG REQUIRED)
endif()

# FindCUDNN.cmake distributed with PyTorch is a bit broken, so we have a
Expand Down Expand Up @@ -118,7 +116,7 @@ set_target_properties(metatomic_torch PROPERTIES
BUILD_VERSION ${METATOMIC_TORCH_FULL_VERSION}
)

target_link_libraries(metatomic_torch PUBLIC torch metatensor_torch metatensor ${CMAKE_DL_LIBS})
target_link_libraries(metatomic_torch PUBLIC torch metatensor_torch ${CMAKE_DL_LIBS})
target_compile_features(metatomic_torch PUBLIC cxx_std_17)
target_include_directories(metatomic_torch PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
Expand Down Expand Up @@ -195,15 +193,7 @@ FetchContent_Declare(nlohmann_json
URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz
URL_HASH SHA256=d6c65aca6b1ed68e7a182f4757257b107ae403032760ed6ef121c9d55e81757d
)
if (CMAKE_VERSION VERSION_GREATER 3.18)
FetchContent_MakeAvailable(nlohmann_json)
else()
if (NOT nlohmann_json_POPULATED)
FetchContent_Populate(nlohmann_json)
endif()

add_subdirectory(${nlohmann_json_SOURCE_DIR} ${nlohmann_json_BINARY_DIR})
endif()
FetchContent_MakeAvailable(nlohmann_json)

target_link_libraries(metatomic_torch PRIVATE nlohmann_json::nlohmann_json)

Expand Down
Loading