ocio

Signed-off-by: Larry Gritz <[email protected]>
lgritz · Mar 29, 2024 · 6e476c9 · 6e476c9
1 parent 540eea9
commit 6e476c9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/src/cmake/build_Imath.cmake b/src/cmake/build_Imath.cmake
@@ -24,7 +24,8 @@ CPMAddPackage (NAME Imath
 )
 
 set (Imath_VERSION ${Imath_LOCAL_BUILD_VERSION})
-get_target_property(IMATH_INCLUDES Imath::Imath INTERFACE_INCLUDE_DIRECTORIES)
+
+# get_target_property(IMATH_INCLUDES Imath::Imath INTERFACE_INCLUDE_DIRECTORIES)
 
 
 # From OpenEXR's build:
@@ -40,18 +41,17 @@ get_target_property(IMATH_INCLUDES Imath::Imath INTERFACE_INCLUDE_DIRECTORIES)
 # endif()
 
 
-# Reset IMATH_INCLUDES to point to where the header files live in this
-# downloaded Imath.
-message (STATUS "In build_Imath.cmake, Imath_INCLUDES=${IMATH_INCLUDES}")
-set (IMATH_INCLUDES "${Imath_SOURCE_DIR}/src/Imath"
-                    "${Imath_BINARY_DIR}/config")
-message (STATUS "Resetting to Imath_INCLUDES=${IMATH_INCLUDES}")
+# # Reset IMATH_INCLUDES to point to where the header files live in this
+# # downloaded Imath.
+# message (STATUS "In build_Imath.cmake, Imath_INCLUDES=${IMATH_INCLUDES}")
+# set (IMATH_INCLUDES "${Imath_SOURCE_DIR}/src/Imath"
+#                     "${Imath_BINARY_DIR}/config")
+# message (STATUS "Resetting to Imath_INCLUDES=${IMATH_INCLUDES}")
 
 # Need a link so that we can #include <Imath/blah.h> because in the Imath
 # source, the headers are not in an Imath subdirectory.
-file (CREATE_LINK ${Imath_SOURCE_DIR}/src/Imath ${Imath_SOURCE_DIR}/src/Imath/Imath SYMBOLIC)
+# file (CREATE_LINK ${Imath_SOURCE_DIR}/src/Imath ${Imath_SOURCE_DIR}/src/Imath/Imath SYMBOLIC)
 
-proj_include_directories_prepend ("${Imath_SOURCE_DIR}/src/Imath"
+proj_include_directories_prepend ("${Imath_SOURCE_DIR}/src"
                                   "${Imath_BINARY_DIR}/config")
-# set (${PROJECT_NAME}_include_directories "${Imath_SOURCE_DIR}/src/Imath;${Imath_BINARY_DIR}/src/config;${${PROJECT_NAME}_include_directories}")
-message ("After build_imath, now ${PROJECT_NAME}_include_directories = ${${PROJECT_NAME}_include_directories}}")
+message ("After build_Imath, now ${PROJECT_NAME}_include_directories = ${${PROJECT_NAME}_include_directories}}")
diff --git a/src/cmake/build_OpenColorIO.cmake b/src/cmake/build_OpenColorIO.cmake
@@ -5,7 +5,6 @@
 
 set (OpenColorIO_LOCAL_BUILD_VERSION 2.3.2)
 
-
 CPMAddPackage (NAME OpenColorIO
         VERSION           ${OpenColorIO_LOCAL_BUILD_VERSION}
         GITHUB_REPOSITORY AcademySoftwareFoundation/OpenColorIO
@@ -17,9 +16,11 @@ CPMAddPackage (NAME OpenColorIO
                           "OCIO_BUILD_TESTS OFF"
                           "OCIO_USE_OIIO_FOR_APPS OFF"
                           "OCIO_INSTALL_DOCS OFF"
-                          "OCIO_INSTALL_PKG_CONFIG OFF"
-                          "OCIO_INSTALL_TOOLS OFF"
                           "OCIO_INSTALL_EXT_PACKAGES MISSING"
 )
 
 set (OpenColorIO_VERSION ${OpenColorIO_LOCAL_BUILD_VERSION})
+
+proj_include_directories_prepend ("${OpenColorIO_SOURCE_DIR}/include"
+                                  "${OpenColorIO_BINARY_DIR}/include")
+message ("After build_OpenColorIO, now ${PROJECT_NAME}_include_directories = ${${PROJECT_NAME}_include_directories}}")