1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
|
From 6b4edf8f770982c0fb147fd79322d8967f0795b0 Mon Sep 17 00:00:00 2001
From: Christophe Marin <christophe@krop.fr>
Date: Fri, 7 Mar 2025 10:58:24 +0100
Subject: [PATCH 2/2] CMake fixes
---
CMakeLists.txt | 4 +++-
src/opentime/CMakeLists.txt | 8 +++++---
src/opentimelineio/CMakeLists.txt | 8 +++++---
3 files changed, 13 insertions(+), 7 deletions(-)
Index: opentimelineio-0.18.1/CMakeLists.txt
===================================================================
--- opentimelineio-0.18.1.orig/CMakeLists.txt
+++ opentimelineio-0.18.1/CMakeLists.txt
@@ -20,6 +20,8 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15"
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()
Index: opentimelineio-0.18.1/src/opentime/CMakeLists.txt
===================================================================
--- opentimelineio-0.18.1.orig/src/opentime/CMakeLists.txt
+++ opentimelineio-0.18.1/src/opentime/CMakeLists.txt
@@ -24,6 +24,8 @@ target_include_directories(
)
set_target_properties(opentime PROPERTIES
+ VERSION ${OTIO_VERSION}
+ SOVERSION 0
DEBUG_POSTFIX "${OTIO_DEBUG_POSTFIX}"
LIBRARY_OUTPUT_NAME "opentime"
POSITION_INDEPENDENT_CODE TRUE)
@@ -73,7 +75,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 +83,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 +92,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(
Index: opentimelineio-0.18.1/src/opentimelineio/CMakeLists.txt
===================================================================
--- opentimelineio-0.18.1.orig/src/opentimelineio/CMakeLists.txt
+++ opentimelineio-0.18.1/src/opentimelineio/CMakeLists.txt
@@ -99,6 +99,8 @@ target_link_libraries(opentimelineio
PUBLIC opentime Imath::Imath)
set_target_properties(opentimelineio PROPERTIES
+ VERSION ${OTIO_VERSION}
+ SOVERSION 0
DEBUG_POSTFIX "${OTIO_DEBUG_POSTFIX}"
LIBRARY_OUTPUT_NAME "opentimelineio"
POSITION_INDEPENDENT_CODE TRUE)
@@ -151,7 +153,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 +161,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 +170,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(
|
