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

[cmake] fix findOpenEXR missing " escapes #788

Merged
merged 1 commit into from
May 10, 2020
Merged
Changes from all commits
Commits
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
[cmake] fix findOpenEXR missing " escapes
fix #787
  • Loading branch information
simogasp committed May 10, 2020

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
commit 8b71c65384315750d3ddbae1ea13cb9e0083af89
6 changes: 3 additions & 3 deletions src/cmake/FindOpenEXR.cmake
Original file line number Diff line number Diff line change
@@ -63,11 +63,11 @@ if (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h")

# Must be at least 2.0
file(STRINGS "${OPENEXR_INCLUDE_PATH}/OpenEXR/OpenEXRConfig.h" TMP REGEX "^#define OPENEXR_VERSION_STRING .*$")
string (REGEX MATCHALL "[0-9]+[.0-9]+" OPENEXR_VERSION ${TMP})
string (REGEX MATCHALL "[0-9]+[.0-9]+" OPENEXR_VERSION "${TMP}")
file(STRINGS "${OPENEXR_INCLUDE_PATH}/OpenEXR/OpenEXRConfig.h" TMP REGEX "^#define OPENEXR_VERSION_MAJOR .*$")
string (REGEX MATCHALL "[0-9]+" OPENEXR_VERSION_MAJOR ${TMP})
string (REGEX MATCHALL "[0-9]+" OPENEXR_VERSION_MAJOR "${TMP}")
file(STRINGS "${OPENEXR_INCLUDE_PATH}/OpenEXR/OpenEXRConfig.h" TMP REGEX "^#define OPENEXR_VERSION_MINOR .*$")
string (REGEX MATCHALL "[0-9]+" OPENEXR_VERSION_MINOR ${TMP})
string (REGEX MATCHALL "[0-9]+" OPENEXR_VERSION_MINOR "${TMP}")
else ()
message(STATUS "File ${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h does not exist. Default to 1.6.1")
# Assume an old one, predates 2.x that had versions