File 0002-CMake-fixes.patch of Package opentimelineio
From c03dae99da5e4256561f014d6b4be32c8258efd8 Mon Sep 17 00:00:00 2001
From: Christophe Marin <christophe@krop.fr>
Date: Fri, 7 Mar 2025 10:58:24 +0100
Subject: [PATCH] CMake fixes
---
CMakeLists.txt | 7 +++----
src/opentime/CMakeLists.txt | 6 +++---
src/opentimelineio/CMakeLists.txt | 6 +++---
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69a7b4d..babc6c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,8 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment ve
project(OpenTimelineIO VERSION ${OTIO_VERSION} LANGUAGES C CXX)
+include(GNUInstallDirs)
+
#------------------------------------------------------------------------------
# Options
# Add all options and settings here for all subprojects to aid in project
@@ -106,7 +108,7 @@ if(OTIO_PYTHON_INSTALL)
endif()
else()
- set(OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+ set(OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}")
message(STATUS "OTIO C++ installing to ${CMAKE_INSTALL_PREFIX}")
endif()
@@ -263,9 +265,6 @@ else()
message(STATUS "Using src/deps/rapidjson by default")
endif()
-# set up the internally hosted dependencies
-add_subdirectory(src/deps)
-
add_subdirectory(src/opentime)
add_subdirectory(src/opentimelineio)
diff --git a/src/opentime/CMakeLists.txt b/src/opentime/CMakeLists.txt
index 9133e4e..341bead 100644
--- a/src/opentime/CMakeLists.txt
+++ b/src/opentime/CMakeLists.txt
@@ -73,7 +73,7 @@ if(OTIO_CXX_INSTALL)
RUNTIME DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}")
install(EXPORT OpenTimeTargets
- DESTINATION "${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentime"
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/opentime"
NAMESPACE OTIO:: )
include(CMakePackageConfigHelpers)
@@ -81,7 +81,7 @@ if(OTIO_CXX_INSTALL)
${CMAKE_CURRENT_SOURCE_DIR}/OpenTimeConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/OpenTimeConfig.cmake
INSTALL_DESTINATION
- ${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentime
+ ${CMAKE_INSTALL_LIBDIR}/cmake/opentime
NO_SET_AND_CHECK_MACRO
NO_CHECK_REQUIRED_COMPONENTS_MACRO
)
@@ -90,7 +90,7 @@ if(OTIO_CXX_INSTALL)
FILES
${CMAKE_CURRENT_BINARY_DIR}/OpenTimeConfig.cmake
DESTINATION
- ${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentime
+ ${CMAKE_INSTALL_LIBDIR}/cmake/opentime
)
install(
diff --git a/src/opentimelineio/CMakeLists.txt b/src/opentimelineio/CMakeLists.txt
index 2ca319b..3644cc4 100644
--- a/src/opentimelineio/CMakeLists.txt
+++ b/src/opentimelineio/CMakeLists.txt
@@ -151,7 +151,7 @@ if(OTIO_CXX_INSTALL)
RUNTIME DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}")
install(EXPORT OpenTimelineIOTargets
- DESTINATION "${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentimelineio"
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/opentimelineio"
NAMESPACE OTIO:: )
include(CMakePackageConfigHelpers)
@@ -159,7 +159,7 @@ if(OTIO_CXX_INSTALL)
${CMAKE_CURRENT_SOURCE_DIR}/OpenTimelineIOConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/OpenTimelineIOConfig.cmake
INSTALL_DESTINATION
- ${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentimelineio
+ ${CMAKE_INSTALL_LIBDIR}/cmake/opentimelineio
NO_SET_AND_CHECK_MACRO
NO_CHECK_REQUIRED_COMPONENTS_MACRO
)
@@ -168,7 +168,7 @@ if(OTIO_CXX_INSTALL)
FILES
${CMAKE_CURRENT_BINARY_DIR}/OpenTimelineIOConfig.cmake
DESTINATION
- ${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentimelineio
+ ${CMAKE_INSTALL_LIBDIR}/cmake/opentimelineio
)
install(
--
2.51.1