Skip to content
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 version to 9.4.6 #12055

Merged
merged 4 commits into from
Mar 7, 2024
Merged

Bump version to 9.4.6 #12055

merged 4 commits into from
Mar 7, 2024

Conversation

roigcarlo
Copy link
Member

📝 Description
Bumps version to 9.4.6 and fixes issues with the docker image and the med package.

No need to merge for the Release, but would be good to have eventually as 9.4.4 and, 9.4.5 bumps were never merged

@roigcarlo roigcarlo requested a review from a team as a code owner February 12, 2024 21:23
philbucher
philbucher previously approved these changes Feb 13, 2024
@@ -79,6 +79,33 @@ endif(${INSTALL_TESTING_FILES} MATCHES ON)
install(TARGETS KratosMedCore DESTINATION libs )
install(TARGETS KratosMedApplication DESTINATION libs )

file(TO_CMAKE_PATH "${HDF5_ROOT}/bin" HDF5_ROOT_DEP)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

legend

I am happy you got asked for win support of the MED-App before I did 🤝 :D

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤣

@roigcarlo roigcarlo merged commit 97b65cf into master Mar 7, 2024
15 of 17 checks passed
Comment on lines +85 to +107
# Track down DLL and install them along with Kratos libs.
# This is disabled until I can make it work in linux. Please do not delete it.
# install(CODE "set(HDF5_ROOT_DEP \"${HDF5_ROOT_DEP}\")")
# install(CODE "set(MED_ROOT_DEP \"${MED_ROOT_DEP}\")")
# install(CODE [[
# file(GET_RUNTIME_DEPENDENCIES
# RESOLVED_DEPENDENCIES_VAR RES
# UNRESOLVED_DEPENDENCIES_VAR UNRES
# CONFLICTING_DEPENDENCIES_PREFIX CONFLICTING_DEPENDENCIES
# DIRECTORIES ${HDF5_ROOT_DEP} ${MED_ROOT_DEP}
# LIBRARIES $<TARGET_FILE:KratosMedCore>
# PRE_EXCLUDE_REGEXES "api-ms-" "ext-ms-"
# POST_EXCLUDE_REGEXES ".*system32/.*\\.dll"
# )

# foreach(_file ${RES})
# file(INSTALL
# DESTINATION "${CMAKE_INSTALL_PREFIX}/libs"
# TYPE SHARED_LIBRARY
# FILES "${_file}"
# )
# endforeach()
# ]])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this left intentional?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, I put a commenet about that :P.

Currently only works on win because its different with so. I will fix it asap but the FullDebug CI has prio and I don't want to remove or leave that aside

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, ofc I only read the first line of the commend 🤦

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants