Skip to content

Commit 630818d

Browse files
SConstruct : Improve OpenEXR version detection
Recent OpenEXR 3.1.x releases have patch versions in the double-digits.
1 parent cd22b19 commit 630818d

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Changes

Lines changed: 5 additions & 0 deletions
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

Lines changed: 1 addition & 1 deletion
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)