Port Imath includes to Imath/*.h

As suggested by Imath devs, see AcademySoftwareFoundation/Imath#136 (comment)

This is possible now that Imath 2 support was dropped

Signed-off-by: Julius Künzel <julius.kuenzel@kde.org>

Author: jlskuz

src/opentimelineio/CMakeLists.txt

@@ -82,6 +82,10 @@ target_include_directories(opentimelineio
                   "${PROJECT_SOURCE_DIR}/src/deps"
                   "${PROJECT_SOURCE_DIR}/src/deps/rapidjson/include")
 
+if(USE_DEPS_IMATH)
+    target_include_directories(opentimelineio PRIVATE "${PROJECT_SOURCE_DIR}/src/deps/Imath/src")
+endif()
+
 target_link_libraries(opentimelineio 
     PUBLIC opentime Imath::Imath)
 

src/opentimelineio/composable.h

@@ -6,7 +6,7 @@
 #include "opentimelineio/serializableObjectWithMetadata.h"
 #include "opentimelineio/version.h"
 
-#include <ImathBox.h>
+#include <Imath/ImathBox.h>
 
 namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
 

src/opentimelineio/mediaReference.h

@@ -6,7 +6,7 @@
 #include "opentimelineio/serializableObjectWithMetadata.h"
 #include "opentimelineio/version.h"
 
-#include <ImathBox.h>
+#include <Imath/ImathBox.h>
 
 namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
 

src/opentimelineio/serializableObject.h

@@ -12,7 +12,7 @@
 #include "opentimelineio/typeRegistry.h"
 #include "opentimelineio/version.h"
 
-#include "ImathBox.h"
+#include "Imath/ImathBox.h"
 #include "serialization.h"
 
 #include <list>

src/py-opentimelineio/opentimelineio-bindings/CMakeLists.txt

@@ -25,6 +25,10 @@ target_include_directories(_otio
     PRIVATE "${PROJECT_SOURCE_DIR}/src/deps/optional-lite/include"
 )
 
+if(USE_DEPS_IMATH)
+    target_include_directories(_otio PRIVATE "${PROJECT_SOURCE_DIR}/src/deps/Imath/src")
+endif()
+
 target_link_libraries(_otio PUBLIC opentimelineio opentime)
 
 # The version of pybind11 we are currently using generates an overwhelming number of

src/py-opentimelineio/opentimelineio-bindings/otio_bindings.cpp

@@ -14,7 +14,7 @@
 #include "opentimelineio/typeRegistry.h"
 #include "opentimelineio/stackAlgorithm.h"
 
-#include <ImathBox.h>
+#include <Imath/ImathBox.h>
 
 namespace py = pybind11;
 using namespace pybind11::literals;

src/py-opentimelineio/opentimelineio-bindings/otio_imath.cpp

@@ -6,8 +6,8 @@
 
 #include "otio_utils.h"
 
-#include "ImathBox.h"
-#include "ImathVec.h"
+#include "Imath/ImathBox.h"
+#include "Imath/ImathVec.h"
 
 namespace py = pybind11;
 

src/py-opentimelineio/opentimelineio-bindings/otio_serializableObjects.cpp

@@ -32,7 +32,7 @@
 #include "otio_utils.h"
 #include "otio_anyDictionary.h"
 
-#include "ImathBox.h"
+#include "Imath/ImathBox.h"
 
 namespace py = pybind11;
 using namespace pybind11::literals;

src/py-opentimelineio/opentimelineio-bindings/otio_utils.cpp

@@ -11,7 +11,7 @@
 #include "opentimelineio/safely_typed_any.h"
 #include "opentimelineio/stringUtils.h"
 
-#include <ImathBox.h>
+#include <Imath/ImathBox.h>
 
 #include <map>
 #include <cstring>

tests/CMakeLists.txt

@@ -3,6 +3,10 @@ include_directories(${PROJECT_SOURCE_DIR}/src
     ${PROJECT_SOURCE_DIR}/src/deps/optional-lite/include
 	${PROJECT_SOURCE_DIR}/src/tests)
 
+if(USE_DEPS_IMATH)
+    include_directories(${PROJECT_SOURCE_DIR}/src/deps/Imath/src)
+endif()
+
 list(APPEND tests_opentime test_opentime)
 foreach(test ${tests_opentime})
 	add_executable(${test} utils.h utils.cpp ${test}.cpp)