Skip to content

Fix OpenEXR3 compatibility (raises minimum version) and use upstream's CMake Config #41

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.

Sign up for GitHub

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

Open
a17r wants to merge 2 commits into
base: 3.6
Choose a base branch
from
+8 −135
Open

Fix OpenEXR3 compatibility (raises minimum version) and use upstream's CMake Config #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d43613
Fix build with OpenEXR 3 and use upstream OpenEXR CMake Config
DarthGandalf Feb 16, 2022
9685150
Drop obsolete local FindOpenEXR.cmake and Findilmbase.cmake
a17r Jan 22, 2026
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
3 changes: 1 addition & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,10 +739,9 @@ IF(ANDROID AND OSG_FIND_3RD_PARTY_DEPS)
ELSE()
# Common to all platforms except android:
FIND_PACKAGE(Freetype)
FIND_PACKAGE(ilmbase)
FIND_PACKAGE(Inventor)
FIND_PACKAGE(Jasper)
FIND_PACKAGE(OpenEXR)
FIND_PACKAGE(OpenEXR 3.0 CONFIG)
FIND_PACKAGE(OpenCascade)
FIND_PACKAGE(COLLADA)
FIND_PACKAGE(FBX)
Expand Down
61 changes: 0 additions & 61 deletions CMakeModules/FindOpenEXR.cmake
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions CMakeModules/Findilmbase.cmake
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/osgPlugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ ENDIF()
IF(JASPER_FOUND)
ADD_PLUGIN_DIRECTORY(jp2)
ENDIF()
IF(OPENEXR_FOUND AND ZLIB_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
IF(OpenEXR_FOUND AND ZLIB_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
ADD_PLUGIN_DIRECTORY(exr)
ENDIF()
IF(GIFLIB_FOUND)
Expand Down
6 changes: 2 additions & 4 deletions src/osgPlugins/exr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
INCLUDE_DIRECTORIES( ${ILMBASE_INCLUDE_DIR}/OpenEXR )
INCLUDE_DIRECTORIES( ${OPENEXR_INCLUDE_DIR}/OpenEXR )

SET(TARGET_SRC ReaderWriterEXR.cpp )

SET(TARGET_LIBRARIES_VARS ${OPENEXR_LIBRARIES_VARS} ${ILMBASE_LIBRARIES_VARS} ZLIB_LIBRARIES)
SET(OPENEXR_LIBRARIES_VARS OpenEXR::OpenEXR)
SET(TARGET_LIBRARIES_VARS OPENEXR_LIBRARIES_VARS ZLIB_LIBRARIES)

IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
REMOVE_CXX_FLAG(-Wshadow)
Expand Down
8 changes: 4 additions & 4 deletions src/osgPlugins/exr/ReaderWriterEXR.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ class C_IStream: public Imf::IStream
{
return _inStream->read(c,n).good();
};
virtual Int64 tellg ()
virtual uint64_t tellg ()
{
return _inStream->tellg();
};
virtual void seekg (Int64 pos)
virtual void seekg (uint64_t pos)
{
_inStream->seekg(pos);
};
Expand All @@ -69,11 +69,11 @@ class C_OStream: public Imf::OStream
{
_outStream->write(c,n);
};
virtual Int64 tellp ()
virtual uint64_t tellp ()
{
return _outStream->tellp();
};
virtual void seekp (Int64 pos)
virtual void seekp (uint64_t pos)
{
_outStream->seekp(pos);
};
Expand Down