Skip to content

Commit

Permalink
media-libs/openimageio-1.8.16: Update FindOpenEXR.cmake patch
Browse files Browse the repository at this point in the history
Latest version that is likely going to be merged upstream.
  • Loading branch information
devurandom committed Nov 9, 2018
1 parent f89943c commit d6690af
Showing 1 changed file with 6 additions and 6 deletions.
@@ -1,4 +1,4 @@
From 28bcd32d1dfadb4228ee0b85e4aa6742d25f27a6 Mon Sep 17 00:00:00 2001
From 04059a8357fbd88eedbee45ed87efc5f5493da15 Mon Sep 17 00:00:00 2001
From: Dennis Schridde <devurandom@gmx.net>
Date: Fri, 9 Nov 2018 10:36:06 +0100
Subject: [PATCH] Fix FindOpenEXR.cmake to use version detected by pkg-config,
Expand All @@ -16,18 +16,18 @@ Fixes: ec4f679cd7ba175a5470a6198c07ebc6780f4c29
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/cmake/modules/FindOpenEXR.cmake b/src/cmake/modules/FindOpenEXR.cmake
index 9ee97500..4bc96dc8 100644
index 9ee97500..68de7804 100644
--- a/src/cmake/modules/FindOpenEXR.cmake
+++ b/src/cmake/modules/FindOpenEXR.cmake
@@ -53,7 +53,11 @@ find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h
find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h)

# Try to figure out version number
-if (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h")
+if (DEFINED _OPENEXR_VERSION)
+ set (OPENEXR_VERSION ${_OPENEXR_VERSION})
+ string (REGEX REPLACE "([0-9]+)\\.[0-9]+" "\\1" OPENEXR_VERSION_MAJOR ${_OPENEXR_VERSION})
+ string (REGEX REPLACE "[0-9]+\\.([0-9]+)" "\\1" OPENEXR_VERSION_MINOR ${_OPENEXR_VERSION})
+if (DEFINED _OPENEXR_VERSION AND NOT "${_OPENEXR_VERSION}" STREQUAL "")
+ set (OPENEXR_VERSION "${_OPENEXR_VERSION}")
+ string (REGEX REPLACE "([0-9]+)\\.[0-9]+" "\\1" OPENEXR_VERSION_MAJOR "${_OPENEXR_VERSION}")
+ string (REGEX REPLACE "[0-9]+\\.([0-9]+)" "\\1" OPENEXR_VERSION_MINOR "${_OPENEXR_VERSION}")
+elseif (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 .*$")
Expand Down

0 comments on commit d6690af

Please sign in to comment.