Skip to content

Commit 9724640

Browse files
michaeldsmithmichaeldsmith
committed
simplify CMake for search for OpenEXR package
1 parent 2bcc03a commit 9724640

File tree

1 file changed

+85
-43
lines changed

1 file changed

+85
-43
lines changed

‎src/apps/CMakeLists.txt‎

Lines changed: 85 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -60,58 +60,100 @@ if( OJPH_ENABLE_OPENEXR_SUPPORT )
6060
# endif( OpenEXR_FOUND )
6161

6262
#find_package(OpenEXR 3 CONFIG QUIET)
63-
find_package(OpenEXR 3 QUIET)
63+
#find_package(OpenEXR 3 QUIET)
64+
find_package(IlmBase QUIET)
65+
if(IlmBase_FOUND)
66+
message(STATUS "Found IlmBase ${IlmBase_VERSION}")
67+
find_package(OpenEXR 2 QUIET)
68+
endif()
69+
70+
if(NOT OpenEXR_FOUND)
71+
#find_package(OpenEXR 3 CONFIG QUIET)
72+
find_package(OpenEXR CONFIG QUIET)
73+
if(OpenEXR_FOUND)
74+
set(OpenEXR_FOUND_WITH_CONFIG TRUE BOOL "found OpenEXR with Config")
75+
endif()
76+
endif()
77+
6478
if(OpenEXR_FOUND)
6579
message(STATUS "Found OpenEXR ${OpenEXR_VERSION}")
6680
set(USE_OPENEXR TRUE CACHE BOOL "Add OpenEXR support")
6781
add_definitions(-DOJPH_ENABLE_OPENEXR_SUPPORT)
82+
if(OpenEXR_FOUND_WITH_CONFIG)
83+
message(STATUS " found OpenEXR with Config")
84+
else(OpenEXR_FOUND_WITH_CONFIG)
85+
message(STATUS " found OpenEXR with FindModule")
86+
endif(OpenEXR_FOUND_WITH_CONFIG)
6887
else(OpenEXR_FOUND)
69-
message(STATUS "OpenEXR v3 not found, looking for OpenEXR v2")
70-
find_package(IlmBase)
71-
if(IlmBase_FOUND)
72-
message(STATUS "Found IlmBase ${IlmBase_VERSION}")
73-
message(STATUS " IlmBase_VERSION = ${OpenEXR_VERSION}")
74-
message(STATUS " IlmBase_INCLUDE_DIR = ${OpenEXR_INCLUDE_DIR}")
75-
message(STATUS " IlmBase_INCLUDE_DIRS = ${OpenEXR_INCLUDE_DIRS}")
76-
message(STATUS " IlmBase_LIBRARY = ${OpenEXR_LIBRARY}")
77-
message(STATUS " IlmBase_LIBRARIES = ${OpenEXR_LIBRARIES}")
78-
find_package(OpenEXR 2)
79-
if(OpenEXR_FOUND)
80-
message(STATUS "Found OpenEXR ${OpenEXR_VERSION}")
81-
set(USE_OPENEXR TRUE CACHE BOOL "Add OpenEXR support")
82-
add_definitions(-DOJPH_ENABLE_OPENEXR_SUPPORT)
83-
# if (MSVC)
84-
# # Suffix for debug configuration libraries
85-
# # (if you should choose to install those)
86-
# set(CMAKE_DEBUG_POSTFIX "_d" CACHE STRING "Suffix for debug builds")
87-
# endif (MSVC)
88-
else(OpenEXR_FOUND)
89-
message(STATUS "OpenEXR support has been enabled but no path to the OpenEXR library "
90-
"has been specified; please configure with -DCMAKE_PREFIX_PATH=<OpenEXR library directory>, "
91-
"or disable OpenEXR support using -DOJPH_ENABLE_OpenEXR_SUPPORT=OFF.")
92-
endif(OpenEXR_FOUND)
93-
else(IlmBase_FOUND)
94-
# try again, but using the CONFIG option
95-
find_package(OpenEXR 3 CONFIG QUIET)
96-
if(OpenEXR_FOUND)
97-
message(STATUS "Found OpenEXR ${OpenEXR_VERSION}")
98-
set(USE_OPENEXR TRUE CACHE BOOL "Add OpenEXR support")
99-
add_definitions(-DOJPH_ENABLE_OPENEXR_SUPPORT)
100-
else(OpenEXR_FOUND)
101-
message(STATUS "OpenEXR support has been enabled but no path to the OpenEXR or IlmBase library "
102-
"has been specified; please configure with -DCMAKE_PREFIX_PATH=<OpenEXR library directory>, "
103-
"or disable OpenEXR support using -DOJPH_ENABLE_OpenEXR_SUPPORT=OFF.")
104-
endif(OpenEXR_FOUND)
105-
endif(IlmBase_FOUND)
106-
88+
message(STATUS "OpenEXR support has been enabled but no path to the OpenEXR or IlmBase library "
89+
"has been specified; please configure with -DCMAKE_PREFIX_PATH=<OpenEXR library directory>, "
90+
"or disable OpenEXR support using -DOJPH_ENABLE_OpenEXR_SUPPORT=OFF.")
10791
endif(OpenEXR_FOUND)
10892

93+
if(IlmBase_FOUND)
94+
message(STATUS "IlmBase info:")
95+
message(STATUS " IlmBase_VERSION = ${IlmBase_VERSION}")
96+
message(STATUS " IlmBase_INCLUDE_DIR = ${IlmBase_INCLUDE_DIR}")
97+
message(STATUS " IlmBase_INCLUDE_DIRS = ${IlmBase_INCLUDE_DIRS}")
98+
message(STATUS " IlmBase_LIBRARY = ${IlmBase_LIBRARY}")
99+
message(STATUS " IlmBase_LIBRARIES = ${IlmBase_LIBRARIES}")
100+
endif(IlmBase_FOUND)
101+
102+
# if(OpenEXR_FOUND)
103+
# message(STATUS "Found OpenEXR ${OpenEXR_VERSION}")
104+
# find_package(Imath CONFIG)
105+
# set(USE_OPENEXR TRUE CACHE BOOL "Add OpenEXR support")
106+
# add_definitions(-DOJPH_ENABLE_OPENEXR_SUPPORT)
107+
# else(OpenEXR_FOUND)
108+
# message(STATUS "OpenEXR v3 not found, looking for OpenEXR v2")
109+
# find_package(IlmBase)
110+
# if(IlmBase_FOUND)
111+
# message(STATUS "Found IlmBase ${IlmBase_VERSION}")
112+
# message(STATUS " IlmBase_VERSION = ${IlmBase_VERSION}")
113+
# message(STATUS " IlmBase_INCLUDE_DIR = ${IlmBase_INCLUDE_DIR}")
114+
# message(STATUS " IlmBase_INCLUDE_DIRS = ${IlmBase_INCLUDE_DIRS}")
115+
# message(STATUS " IlmBase_LIBRARY = ${IlmBase_LIBRARY}")
116+
# message(STATUS " IlmBase_LIBRARIES = ${IlmBase_LIBRARIES}")
117+
# find_package(OpenEXR 2)
118+
# if(OpenEXR_FOUND)
119+
# message(STATUS "Found OpenEXR ${OpenEXR_VERSION}")
120+
# set(USE_OPENEXR TRUE CACHE BOOL "Add OpenEXR support")
121+
# add_definitions(-DOJPH_ENABLE_OPENEXR_SUPPORT)
122+
# # if (MSVC)
123+
# # # Suffix for debug configuration libraries
124+
# # # (if you should choose to install those)
125+
# # set(CMAKE_DEBUG_POSTFIX "_d" CACHE STRING "Suffix for debug builds")
126+
# # endif (MSVC)
127+
# else(OpenEXR_FOUND)
128+
# message(STATUS "OpenEXR support has been enabled but no path to the OpenEXR library "
129+
# "has been specified; please configure with -DCMAKE_PREFIX_PATH=<OpenEXR library directory>, "
130+
# "or disable OpenEXR support using -DOJPH_ENABLE_OpenEXR_SUPPORT=OFF.")
131+
# endif(OpenEXR_FOUND)
132+
# else(IlmBase_FOUND)
133+
# # try again, but using the CONFIG option
134+
# find_package(OpenEXR 3 CONFIG QUIET)
135+
# if(OpenEXR_FOUND)
136+
# message(STATUS "Found OpenEXR ${OpenEXR_VERSION}")
137+
# set(USE_OPENEXR TRUE CACHE BOOL "Add OpenEXR support")
138+
# add_definitions(-DOJPH_ENABLE_OPENEXR_SUPPORT)
139+
# else(OpenEXR_FOUND)
140+
# message(STATUS "OpenEXR support has been enabled but no path to the OpenEXR or IlmBase library "
141+
# "has been specified; please configure with -DCMAKE_PREFIX_PATH=<OpenEXR library directory>, "
142+
# "or disable OpenEXR support using -DOJPH_ENABLE_OpenEXR_SUPPORT=OFF.")
143+
# endif(OpenEXR_FOUND)
144+
# endif(IlmBase_FOUND)
145+
146+
# endif(OpenEXR_FOUND)
147+
109148
if(OpenEXR_FOUND)
149+
message(STATUS "OpenEXR info:")
110150
message(STATUS " OpenEXR_VERSION = ${OpenEXR_VERSION}")
111-
message(STATUS " OpenEXR_INCLUDE_DIR = ${OpenEXR_INCLUDE_DIR}")
112-
message(STATUS " OpenEXR_INCLUDE_DIRS = ${OpenEXR_INCLUDE_DIRS}")
113-
message(STATUS " OpenEXR_LIBRARY = ${OpenEXR_LIBRARY}")
114-
message(STATUS " OpenEXR_LIBRARIES = ${OpenEXR_LIBRARIES}")
151+
if( NOT OpenEXR_FOUND_WITH_CONFIG)
152+
message(STATUS " OpenEXR_INCLUDE_DIR = ${OpenEXR_INCLUDE_DIR}")
153+
message(STATUS " OpenEXR_INCLUDE_DIRS = ${OpenEXR_INCLUDE_DIRS}")
154+
message(STATUS " OpenEXR_LIBRARY = ${OpenEXR_LIBRARY}")
155+
message(STATUS " OpenEXR_LIBRARIES = ${OpenEXR_LIBRARIES}")
156+
endif(NOT OpenEXR_FOUND_WITH_CONFIG)
115157
endif(OpenEXR_FOUND)
116158

117159
endif(OJPH_ENABLE_OPENEXR_SUPPORT)

0 commit comments

Comments
 (0)