Skip to content

Commit 3590653

Browse files
authored
Merge pull request #1407 from murraystevenson/exrVersionFix
SConstruct : Improve OpenEXR version detection
2 parents cd22b19 + 630818d commit 3590653

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Changes

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ Improvements
77

88
- DisplayDriverServer : Fixed delays connecting to the server on Windows.
99

10+
Build
11+
-----
12+
13+
- SConstruct : Support detection of OpenEXR versions with a patch version containing multiple digits.
14+
1015
10.5.6.0 (relative to 10.5.5.0)
1116
========
1217

SConstruct

+1-1
Original file line numberDiff line numberDiff line change
@@ -1308,7 +1308,7 @@ if doConfigure :
13081308

13091309
exrMajorVersion = None
13101310
for line in open( str( exrVersionHeader ) ) :
1311-
m = re.match( r'^#define OPENEXR_VERSION_STRING "(\d)\.(\d)\.(\d)"$', line )
1311+
m = re.match( r'^#define OPENEXR_VERSION_STRING "(\d)\.(\d)\.(\d+)"$', line )
13121312
if m :
13131313
exrMajorVersion = int( m.group( 1 ) )
13141314

0 commit comments

Comments
 (0)