Minor change for smooth build against upcoming Imath 3.0 (#1341)

Signed-off-by: Larry Gritz <[email protected]>
AcademySoftwareFoundation · Mar 2, 2021 · d1231ef · d1231ef
1 parent db350bd
commit d1231ef
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/cmake/cuda_macros.cmake b/src/cmake/cuda_macros.cmake
@@ -20,7 +20,7 @@ function ( NVCC_COMPILE cuda_src ptx_generated extra_nvcc_args )
             "-I${PROJECT_SOURCE_DIR}/src/include"
             "-I${PROJECT_SOURCE_DIR}/src/cuda_common"
             "-I${OPENIMAGEIO_INCLUDES}"
-            "-I${ILMBASE_INCLUDES}"
+            "-I${IMATH_INCLUDES}"
             "-I${Boost_INCLUDE_DIRS}"
             "-DFMT_DEPRECATED=\"\""
             ${LLVM_COMPILE_FLAGS}

diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
@@ -89,6 +89,12 @@ checked_find_package (OpenEXR REQUIRED
                         "OpenEXR 2.2 is the oldest version our CI tests against, and the minimum that supports DWA compression"
                       PRINT IMATH_INCLUDES
                      )
+# Force Imath includes to be before everything else to ensure that we have
+# the right Imath/OpenEXR version, not some older version in the system
+# library. This shoudn't be necessary, except for the common case of people
+# building against Imath/OpenEXR 3.x when there is still a system-level
+# install version of 2.x.
+include_directories(BEFORE ${IMATH_INCLUDES})
 if (CMAKE_COMPILER_IS_CLANG AND OPENEXR_VERSION VERSION_LESS 2.3)
     # clang C++ >= 11 doesn't like 'register' keyword in old exr headers
     add_compile_options (-Wno-deprecated-register)

diff --git a/src/liboslexec/CMakeLists.txt b/src/liboslexec/CMakeLists.txt
@@ -187,7 +187,7 @@ target_include_directories (${local_lib}
     PUBLIC
         ${CMAKE_INSTALL_FULL_INCLUDEDIR}
         ${OPENIMAGEIO_INCLUDES}
-        ${ILMBASE_INCLUDES}
+        ${IMATH_INCLUDES}
     PRIVATE
         "${CMAKE_SOURCE_DIR}/src/liboslcomp"
     )

diff --git a/src/liboslquery/CMakeLists.txt b/src/liboslquery/CMakeLists.txt
@@ -13,12 +13,12 @@ target_include_directories (${local_lib}
     PUBLIC
         ${CMAKE_INSTALL_FULL_INCLUDEDIR}
         ${OPENIMAGEIO_INCLUDES}
-        ${ILMBASE_INCLUDES}
+        ${IMATH_INCLUDES}
     PRIVATE
         ../liboslexec)
 target_link_libraries (${local_lib}
     PUBLIC
-        ${OPENIMAGEIO_LIBRARIES} ${ILMBASE_LIBRARIES}
+        ${OPENIMAGEIO_LIBRARIES} ${IMATH_LIBRARIES}
     PRIVATE
         ${Boost_LIBRARIES}
     )