80 lines
3.6 KiB
Diff
80 lines
3.6 KiB
Diff
diff -bur OpenTimelineIO-0.17.0-o/src/opentime/CMakeLists.txt OpenTimelineIO-0.17.0/src/opentime/CMakeLists.txt
|
|
--- OpenTimelineIO-0.17.0-o/src/opentime/CMakeLists.txt 2025-05-07 20:02:24.561015100 -0600
|
|
+++ OpenTimelineIO-0.17.0/src/opentime/CMakeLists.txt 2025-05-07 20:04:04.016323600 -0600
|
|
@@ -39,25 +39,24 @@
|
|
|
|
if(OTIO_CXX_INSTALL)
|
|
install(FILES ${OPENTIME_HEADER_FILES}
|
|
- DESTINATION "${OTIO_RESOLVED_CXX_INSTALL_DIR}/include/opentime")
|
|
+ DESTINATION "include/opentime")
|
|
|
|
install(TARGETS opentime
|
|
EXPORT OpenTimeTargets
|
|
- INCLUDES DESTINATION "${OTIO_RESOLVED_CXX_INSTALL_DIR}/include"
|
|
- ARCHIVE DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}"
|
|
- LIBRARY DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}"
|
|
- RUNTIME DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}")
|
|
+ INCLUDES DESTINATION "include"
|
|
+ ARCHIVE DESTINATION "lib"
|
|
+ LIBRARY DESTINATION "lib"
|
|
+ RUNTIME DESTINATION "bin")
|
|
|
|
install(EXPORT OpenTimeTargets
|
|
- DESTINATION "${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentime"
|
|
+ DESTINATION "share/opentime"
|
|
NAMESPACE OTIO:: )
|
|
|
|
include(CMakePackageConfigHelpers)
|
|
configure_package_config_file(
|
|
${CMAKE_CURRENT_SOURCE_DIR}/OpenTimeConfig.cmake.in
|
|
${CMAKE_CURRENT_BINARY_DIR}/OpenTimeConfig.cmake
|
|
- INSTALL_DESTINATION
|
|
- ${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentime
|
|
+ INSTALL_DESTINATION "share/opentime"
|
|
NO_SET_AND_CHECK_MACRO
|
|
NO_CHECK_REQUIRED_COMPONENTS_MACRO
|
|
)
|
|
diff -bur OpenTimelineIO-0.17.0-o/src/opentimelineio/CMakeLists.txt OpenTimelineIO-0.17.0/src/opentimelineio/CMakeLists.txt
|
|
--- OpenTimelineIO-0.17.0-o/src/opentimelineio/CMakeLists.txt 2025-05-07 20:02:24.588161100 -0600
|
|
+++ OpenTimelineIO-0.17.0/src/opentimelineio/CMakeLists.txt 2025-05-07 20:04:49.208710600 -0600
|
|
@@ -109,30 +109,29 @@
|
|
|
|
if(OTIO_CXX_INSTALL)
|
|
install(FILES ${OPENTIMELINEIO_HEADER_FILES}
|
|
- DESTINATION "${OTIO_RESOLVED_CXX_INSTALL_DIR}/include/opentimelineio")
|
|
+ DESTINATION "include/opentimelineio")
|
|
|
|
- set(OPENTIMELINEIO_INCLUDES ${OTIO_RESOLVED_CXX_INSTALL_DIR}/include)
|
|
+ set(OPENTIMELINEIO_INCLUDES include)
|
|
if(OTIO_DEPENDENCIES_INSTALL)
|
|
- list(APPEND OPENTIMELINEIO_INCLUDES ${OTIO_RESOLVED_CXX_INSTALL_DIR}/include/opentimelineio/deps)
|
|
+ list(APPEND OPENTIMELINEIO_INCLUDES include/opentimelineio/deps)
|
|
endif()
|
|
|
|
install(TARGETS opentimelineio
|
|
EXPORT OpenTimelineIOTargets
|
|
- INCLUDES DESTINATION "${OPENTIMELINEIO_INCLUDES}"
|
|
- ARCHIVE DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}"
|
|
- LIBRARY DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}"
|
|
- RUNTIME DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}")
|
|
+ INCLUDES DESTINATION "include"
|
|
+ ARCHIVE DESTINATION "lib"
|
|
+ LIBRARY DESTINATION "lib"
|
|
+ RUNTIME DESTINATION "bin")
|
|
|
|
install(EXPORT OpenTimelineIOTargets
|
|
- DESTINATION "${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentimelineio"
|
|
+ DESTINATION "share/opentimelineio"
|
|
NAMESPACE OTIO:: )
|
|
|
|
include(CMakePackageConfigHelpers)
|
|
configure_package_config_file(
|
|
${CMAKE_CURRENT_SOURCE_DIR}/OpenTimelineIOConfig.cmake.in
|
|
${CMAKE_CURRENT_BINARY_DIR}/OpenTimelineIOConfig.cmake
|
|
- INSTALL_DESTINATION
|
|
- ${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentimelineio
|
|
+ INSTALL_DESTINATION "share/opentimelineio"
|
|
NO_SET_AND_CHECK_MACRO
|
|
NO_CHECK_REQUIRED_COMPONENTS_MACRO
|
|
)
|