cmake: fix Linux system OpenEXR detection#16294
Merged
opencv-pushbot merged 1 commit intoopencv:3.4from Jan 17, 2020
h6197627:master
Merged
cmake: fix Linux system OpenEXR detection#16294opencv-pushbot merged 1 commit intoopencv:3.4from h6197627:master
opencv-pushbot merged 1 commit intoopencv:3.4from
h6197627:master
Conversation
Contributor
|
The solution works for me at least with Ubuntu 16.04. |
Contributor
|
This patch should go into 3.4 branch first. We will merge changes from 3.4 into master regularly (weekly/bi-weekly). So, please:
Note: no needs to re-open PR, apply changes "inplace". |
alalek
reviewed
Jan 11, 2020
Member
alalek
left a comment
There was a problem hiding this comment.
ignores empty suffix ("") while iterating in FOREACH loop
Yes, it is known CMake behavior.
So lets "iterate" through macro helper (something like this).
- SET(LIBRARY_SUFFIXES
- "-${OPENEXR_VERSION}" "-${OPENEXR_VERSION}"
- "-${OPENEXR_VERSION}_s" "-${OPENEXR_VERSION}_s"
- "-${OPENEXR_VERSION}_d" "-${OPENEXR_VERSION}_d"
- "-${OPEXEXR_VERSION}_s_d" "-${OPEXEXR_VERSION}_s_d"
- ""
- "_s" "_s"
- "_d" "_d"
- "_s_d") "_s_d")
- FOREACH(LIBRARY_SUFFIX ${LIBRARY_SUFFIXES}) FOREACH(LIBRARY_SUFFIX ${LIBRARY_SUFFIXES})
+ macro(ocv_find_openexr LIBRARY_SUFFIX)
... current loop code, remove/replace "break()" ...
- endforeach()
+ endmacro()
+ endmacro()
+ macro(ocv_try_openexr LIBRARY_SUFFIX)
+ if(NOT OPENEXR_FOUND) # find first guard
+ ocv_find_openexr(${LIBRARY_SUFFIX})
+ endif()
+ endmacro()
+
+ ocv_try_openexr("-${OPENEXR_VERSION}"
+ ocv_try_openexr("-${OPENEXR_VERSION}_s")
+ ocv_try_openexr("-${OPENEXR_VERSION}_d")
+ ocv_try_openexr("-${OPEXEXR_VERSION}_s_d")
+ ocv_try_openexr("")
+ ocv_try_openexr("_s")
+ ocv_try_openexr("_d")
+ ocv_try_openexr("_s_d")
cmake/OpenCVFindOpenEXR.cmake
Outdated
| if(X86_64) | ||
| SET(OPENEXR_LIBSEARCH_SUFFIXES x86_64-linux-gnu) | ||
| elseif(X86) | ||
| SET(OPENEXR_LIBSEARCH_SUFFIXES i386-linux-gnu) |
Member
There was a problem hiding this comment.
Consider using CMAKE_LIBRARY_ARCHITECTURE variable instead.
cmake/OpenCVFindOpenEXR.cmake
Outdated
| string(TOUPPER "${LIBRARY_NAME}" LIBRARY_NAME_UPPER) | ||
| FIND_LIBRARY(OPENEXR_${LIBRARY_NAME_UPPER}_LIBRARY | ||
| NAMES ${LIBRARY_NAME}${LIBRARY_SUFFIX} | ||
| NAMES ${LIBRARY_NAME} ${LIBRARY_NAME}${LIBRARY_SUFFIX} |
Member
There was a problem hiding this comment.
This would re-introduce mess with names again.
All libraries for found components must have the same suffix. Different subsets must be forbidden.
Contributor
|
@h6197627 friendly reminder |
Contributor
Author
|
@asmorkalov, I rebased and tried to address @alalek comments |
Contributor
|
@h6197627 Looks good to me. Please squash the commits and I'll merge the patch. |
Contributor
Author
|
@asmorkalov, done |
Contributor
|
👍 |
asmorkalov
approved these changes
Jan 17, 2020
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
resolves #16293