Skip to content

Commit 72d0765

Browse files
committed
Use global include_directories for internal Imath
Signed-off-by: Julius Künzel <[email protected]>
1 parent e13c628 commit 72d0765

File tree

4 files changed

+4
-11
lines changed

4 files changed

+4
-11
lines changed

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,10 @@ else()
236236
set(USE_DEPS_IMATH ON)
237237
endif()
238238

239+
if(USE_DEPS_IMATH)
240+
include_directories("${PROJECT_SOURCE_DIR}/src/deps/Imath/src")
241+
endif()
242+
239243
# set up the internally hosted dependencies
240244
add_subdirectory(src/deps)
241245

src/opentimelineio/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,6 @@ target_include_directories(opentimelineio
8282
"${PROJECT_SOURCE_DIR}/src/deps"
8383
"${PROJECT_SOURCE_DIR}/src/deps/rapidjson/include")
8484

85-
if(USE_DEPS_IMATH)
86-
target_include_directories(opentimelineio PRIVATE "${PROJECT_SOURCE_DIR}/src/deps/Imath/src")
87-
endif()
8885

8986
target_link_libraries(opentimelineio
9087
PUBLIC opentime Imath::Imath)

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ target_include_directories(_otio
2525
PRIVATE "${PROJECT_SOURCE_DIR}/src/deps/optional-lite/include"
2626
)
2727

28-
if(USE_DEPS_IMATH)
29-
target_include_directories(_otio PRIVATE "${PROJECT_SOURCE_DIR}/src/deps/Imath/src")
30-
endif()
31-
3228
target_link_libraries(_otio PUBLIC opentimelineio opentime)
3329

3430
# The version of pybind11 we are currently using generates an overwhelming number of

tests/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ include_directories(${PROJECT_SOURCE_DIR}/src
33
${PROJECT_SOURCE_DIR}/src/deps/optional-lite/include
44
${PROJECT_SOURCE_DIR}/src/tests)
55

6-
if(USE_DEPS_IMATH)
7-
include_directories(${PROJECT_SOURCE_DIR}/src/deps/Imath/src)
8-
endif()
9-
106
list(APPEND tests_opentime test_opentime)
117
foreach(test ${tests_opentime})
128
add_executable(${test} utils.h utils.cpp ${test}.cpp)

0 commit comments

Comments
 (0)