Skip to content

[freeimage, libwebp, OpenEXR, OpenVDB] Updates#5417

Merged
vicroms merged 22 commits intomasterfrom
dev/viromer/5228
Feb 26, 2019
Merged

[freeimage, libwebp, OpenEXR, OpenVDB] Updates#5417
vicroms merged 22 commits intomasterfrom
dev/viromer/5228

Conversation

@vicroms
Copy link
Copy Markdown
Member

@vicroms vicroms commented Feb 22, 2019

This branch integrates changes from these PRs:

In order to avoid causing regressions in the master branch, it is necessary to merge all of these PRs together.

@cenit please review these changes

cenit and others added 22 commits January 22, 2019 18:05
… custom find_package script in favour of original Config files for cmake
…still maintaining backwards compatibility (there's an official one distributed with the package but it is completely different, for now it is avoided)
@vicroms vicroms self-assigned this Feb 22, 2019
@vicroms vicroms changed the title [libwebp, freeimage, OpenEXR, OpenVDB] Updates [freeimage, libwebp, OpenEXR, OpenVDB] Updates Feb 22, 2019
@cenit
Copy link
Copy Markdown
Contributor

cenit commented Feb 25, 2019

@vicroms thanks. So in the end this time was better a unique big PR, I agree :)
I will check it today, will let you know afterwards

@cenit
Copy link
Copy Markdown
Contributor

cenit commented Feb 25, 2019

I put some comments , mainly related to CMAKE_EXECUTABLE_SUFFIX.
Apart from that, I tried building this branch and it LGTM.

@vicroms vicroms merged commit bd94d1e into master Feb 26, 2019
@vicroms
Copy link
Copy Markdown
Member Author

vicroms commented Feb 26, 2019

@cenit

Thank you!
Your PRs have been merged.


# Handle copyright
if("all" IN_LIST FEATURES)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/get_disto.exe)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

shall we use ${CMAKE_EXECUTABLE_SUFFIX} for each tool, instead of ".exe", to be compatible with *nix?

file(REMOVE ${DLLS})
endforeach()
# NOTE: Only use ".exe" extension on Windows executables.
# Is there a cleaner way to do this?
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

yes, using the CMake default symbol ${CMAKE_EXECUTABLE_SUFFIX}

@cenit cenit mentioned this pull request Feb 26, 2019
@cenit
Copy link
Copy Markdown
Contributor

cenit commented Feb 26, 2019

I think the review was not submitted?!? Anyway, thanks for the merge. Let's hope everything goes smooth in the next few days with people updating, this PR was very big. I will use it to continue working on OpenCV 4 👍

@cenit cenit mentioned this pull request Feb 27, 2019
@Moeologist
Copy link
Copy Markdown

Break IlmImf-2_3.dll and OpenEXR static build

@grdowns grdowns deleted the dev/viromer/5228 branch April 30, 2019 00:38
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