-
Notifications
You must be signed in to change notification settings - Fork 3
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.
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
Bump atlas to 0.39.0 #23
Open
tehrengruber
wants to merge
10
commits into
master
Choose a base branch
from
bump_atlas_0_39_0
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
fec3374
Bump atlas to 0.39.0
tehrengruber c3fedd9
Fix ECKIT_CODEC
tehrengruber d55a344
Fix ECKIT_CODEC
tehrengruber f3424de
Fix ECKIT_CODEC
tehrengruber 49dcd09
Fix ECKIT_CODEC
tehrengruber b67c67e
Simplify
tehrengruber be51fb6
Version var
tehrengruber 6a7e952
Version var
tehrengruber aebcef7
Version var
tehrengruber 0ed7c40
Fix version check
tehrengruber File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,10 +8,12 @@ set(CMAKE_CXX_STANDARD 17) | |
include(FetchContent) | ||
|
||
function(copy_target ct_tgt) | ||
add_custom_target(copy_${ct_tgt} ALL | ||
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${ct_tgt}> ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} | ||
DEPENDS ${ct_tgt} | ||
) | ||
if(NOT TARGET copy_${ct_tgt}) | ||
add_custom_target(copy_${ct_tgt} ALL | ||
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${ct_tgt}> ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} | ||
DEPENDS ${ct_tgt} | ||
) | ||
endif() | ||
endfunction() | ||
|
||
find_package(atlas QUIET PATHS $ENV{ATLAS_INSTALL_DIR}) | ||
|
@@ -57,14 +59,16 @@ if(NOT atlas_FOUND) | |
|
||
if(_atlas4py_built_eckit) | ||
# copy atlas' eckit dependencies | ||
get_target_property(deps atlas LINK_LIBRARIES) | ||
get_target_property(deps_interface atlas INTERFACE_LINK_LIBRARIES) | ||
list(APPEND deps ${deps_interface}) | ||
list(REMOVE_DUPLICATES deps) | ||
foreach(dep IN LISTS deps) | ||
if(dep MATCHES "eckit.*") | ||
copy_target(${dep}) | ||
endif() | ||
foreach(lib "atlas" "atlas_io") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We need to copy not only the |
||
get_target_property(deps ${lib} LINK_LIBRARIES) | ||
get_target_property(deps_interface ${lib} INTERFACE_LINK_LIBRARIES) | ||
list(APPEND deps ${deps_interface}) | ||
list(REMOVE_DUPLICATES deps) | ||
foreach(dep IN LISTS deps) | ||
if(dep MATCHES "eckit.*") | ||
copy_target(${dep}) | ||
endif() | ||
endforeach() | ||
endforeach() | ||
endif() | ||
endif() | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
__version__ = "0.35.1.dev15" | ||
__version__ = "0.39.0.dev16" |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change just allows calling
copy_target
multiple times with the same argument.