Cmake config fix: make sure Imath headers end up in config include path

CMakeLists.txt

@@ -50,8 +50,6 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 if ("${PROJECT_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
     message (FATAL_ERROR "Not allowed to run in-source build!")
 endif ()
-list (APPEND CMAKE_PREFIX_PATH ${CMAKE_SOURCE_DIR}/ext/dist)
-
 
 option (CMAKE_USE_FOLDERS "Use the FOLDER target property to organize targets into folders." ON)
 mark_as_advanced (CMAKE_USE_FOLDERS)

src/build-scripts/build_cmake.bash

@@ -4,7 +4,8 @@ echo "Building cmake"
 uname
 
 CMAKE_VERSION=${CMAKE_VERSION:=3.12.4}
-CMAKE_INSTALL_DIR=${CMAKE_INSTALL_DIR:=${PWD}/ext/cmake}
+LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext}
+CMAKE_INSTALL_DIR=${CMAKE_INSTALL_DIR:=${LOCAL_DEPS_DIR}/cmake}
 
 if [[ `uname` == "Linux" ]] ; then
     mkdir -p ${CMAKE_INSTALL_DIR} && true

src/build-scripts/build_libraw.bash

@@ -6,9 +6,10 @@ LIBRAW_VERSION=${LIBRAW_VERSION:=0.19.5}
 LIBRAW_BRANCH=${LIBRAW_BRANCH:=${LIBRAW_VERSION}}
 
 # Where to install the final results
-LIBRAW_SOURCE_DIR=${LIBRAW_SOURCE_DIR:=${PWD}/ext/libraw}
-LIBRAW_BUILD_DIR=${LIBRAW_BUILD_DIR:=${PWD}/ext/libraw-build}
-LIBRAW_INSTALL_DIR=${LIBRAW_INSTALL_DIR:=${PWD}/ext/libraw-install}
+LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext}
+LIBRAW_SOURCE_DIR=${LIBRAW_SOURCE_DIR:=${LOCAL_DEPS_DIR}/libraw}
+LIBRAW_BUILD_DIR=${LIBRAW_BUILD_DIR:=${LOCAL_DEPS_DIR}/libraw-build}
+LIBRAW_INSTALL_DIR=${LIBRAW_INSTALL_DIR:=${LOCAL_DEPS_DIR}/libraw-install}
 LIBRAW_BUILD_TYPE=${LIBRAW_BUILD_TYPE:=Release}
 
 pwd

src/build-scripts/build_ocio.bash

@@ -1,8 +1,9 @@
 #!/bin/bash
 
 OCIO_REPO=${OCIO_REPO:=https://github.com/AcademySoftwareFoundation/OpenColorIO.git}
-OCIO_BUILD_DIR=${OCIO_BUILD_DIR:=${PWD}/ext/OpenColorIO}
-OCIO_INSTALL_DIR=${OCIO_INSTALL_DIR:=${PWD}/ext/OpenColorIO/dist}
+LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext}
+OCIO_BUILD_DIR=${OCIO_BUILD_DIR:=${LOCAL_DEPS_DIR}/OpenColorIO}
+OCIO_INSTALL_DIR=${OCIO_INSTALL_DIR:=${LOCAL_DEPS_DIR}/OpenColorIO/dist}
 OCIO_VERSION=${OCIO_VERSION:=1.1.1}
 OCIO_BRANCH=${OCIO_BRANCH:=v${OCIO_VERSION}}
 OCIO_CXX_FLAGS=${OCIO_CXX_FLAGS:="-Wno-unused-function -Wno-deprecated-declarations -Wno-cast-qual -Wno-write-strings"}

src/build-scripts/build_openexr.bash

@@ -6,9 +6,10 @@ OPENEXR_VERSION=${OPENEXR_VERSION:=2.4.0}
 OPENEXR_BRANCH=${OPENEXR_BRANCH:=v${OPENEXR_VERSION}}
 
 # Where to install the final results
-OPENEXR_SOURCE_DIR=${OPENEXR_SOURCE_DIR:=${PWD}/ext/openexr}
-OPENEXR_BUILD_DIR=${OPENEXR_BUILD_DIR:=${PWD}/ext/openexr-build}
-OPENEXR_INSTALL_DIR=${OPENEXR_INSTALL_DIR:=${PWD}/ext/openexr-install}
+LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext}
+OPENEXR_SOURCE_DIR=${OPENEXR_SOURCE_DIR:=${LOCAL_DEPS_DIR}/openexr}
+OPENEXR_BUILD_DIR=${OPENEXR_BUILD_DIR:=${LOCAL_DEPS_DIR}/openexr-build}
+OPENEXR_INSTALL_DIR=${OPENEXR_INSTALL_DIR:=${LOCAL_DEPS_DIR}/openexr-install}
 OPENEXR_BUILD_TYPE=${OPENEXR_BUILD_TYPE:=Release}
 CMAKE_GENERATOR=${CMAKE_GENERATOR:="Unix Makefiles"}
 OPENEXR_CMAKE_FLAGS=${OPENEXR_CMAKE_FLAGS:=""}

src/build-scripts/build_pybind11.bash

@@ -14,7 +14,8 @@ PYBIND11_SRC_DIR=${PYBIND11_SRC_DIR:=${PWD}/ext/pybind11}
 # Temp build area (default to a build/ subdir under source)
 PYBIND11_BUILD_DIR=${PYBIND11_BUILD_DIR:=${PYBIND11_SRC_DIR}/build}
 # Install area for pybind11 (default to ext/dist)
-PYBIND11_INSTALL_DIR=${PYBIND11_INSTALL_DIR:=${PWD}/ext/dist}
+LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext}
+PYBIND11_INSTALL_DIR=${PYBIND11_INSTALL_DIR:=${LOCAL_DEPS_DIR}/dist}
 #PYBIND11_BUILD_OPTS=${PYBIND11_BUILD_OPTS:=}
 
 if [[ "${PYTHON_VERSION}" != "" ]] ; then

src/build-scripts/ci-startup.bash

@@ -55,6 +55,8 @@ export PAR_MAKEFLAGS=-j${PARALLEL}
 export CMAKE_BUILD_PARALLEL_LEVEL=${PARALLEL}
 export CTEST_PARALLEL_LEVEL=${PARALLEL}
 
+export LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=$HOME/ext}
+
 uname -a
 uname -n
 pwd

src/cmake/externalpackages.cmake

@@ -21,6 +21,10 @@ message (STATUS "*   - To exclude an optional dependency (even if found),")
 message (STATUS "*     -DUSE_Package=OFF or set environment var USE_Package=OFF ")
 message (STATUS "${ColorReset}")
 
+set (OIIO_LOCAL_DEPS_PATH "${CMAKE_SOURCE_DIR}/ext/dist" CACHE STRING
+     "Local area for dependencies added to CMAKE_PREFIX_PATH")
+list (APPEND CMAKE_PREFIX_PATH ${CMAKE_SOURCE_DIR}/ext/dist)
+
 set (REQUIED_DEPS "" CACHE STRING
      "Additional dependencies to consider required (semicolon-separated list, or ALL)")
 set (OPTIONAL_DEPS "" CACHE STRING

src/libOpenImageIO/CMakeLists.txt

@@ -123,6 +123,7 @@ source_group ("libtexture" REGULAR_EXPRESSION ".+/libtexture/.+")
 target_include_directories (OpenImageIO
                             PUBLIC
                                 ${CMAKE_INSTALL_FULL_INCLUDEDIR}
+                                ${ILMBASE_INCLUDES}
                                 ${OpenCV_INCLUDES}
                             PRIVATE
                                 ${ROBINMAP_INCLUDES}

src/libutil/CMakeLists.txt

@@ -7,7 +7,9 @@ set (libOpenImageIO_Util_srcs argparse.cpp benchmark.cpp
 
 add_library (OpenImageIO_Util ${libOpenImageIO_Util_srcs})
 target_include_directories (OpenImageIO_Util
-        PUBLIC ${CMAKE_INSTALL_FULL_INCLUDEDIR}
+        PUBLIC
+            ${CMAKE_INSTALL_FULL_INCLUDEDIR}
+            ${ILMBASE_INCLUDES}
         )
 target_link_libraries (OpenImageIO_Util
         PUBLIC