116 lines
4.9 KiB
Diff
116 lines
4.9 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index c3c6958..b38c423 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -75,7 +75,6 @@ if(OTIO_PYTHON_INSTALL)
|
|
if(OTIO_PYTHON_INSTALL_DIR STREQUAL "" AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
|
|
# neither install directory supplied from the command line
|
|
set(OTIO_RESOLVED_PYTHON_INSTALL_DIR "${Python_SITEARCH}")
|
|
- set(OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR "${OTIO_RESOLVED_PYTHON_INSTALL_DIR}/opentimelineio")
|
|
message(STATUS "OTIO Defaulting Python install to ${OTIO_RESOLVED_PYTHON_INSTALL_DIR}")
|
|
else()
|
|
# either python_install or install_prefix have been set
|
|
@@ -86,21 +85,21 @@ if(OTIO_PYTHON_INSTALL)
|
|
# In order to not require setting $PYTHONPATH to point at the .so,
|
|
# the shared libraries are installed into the python library
|
|
# location.
|
|
- set(OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR "${OTIO_RESOLVED_PYTHON_INSTALL_DIR}/opentimelineio")
|
|
message(STATUS "OTIO Defaulting Python install to ${OTIO_RESOLVED_PYTHON_INSTALL_DIR}")
|
|
else()
|
|
# OTIO_PYTHON_INSTALL_DIR was set, so install everything into the python package
|
|
set(OTIO_RESOLVED_PYTHON_INSTALL_DIR "${OTIO_PYTHON_INSTALL_DIR}")
|
|
- set(OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR "${OTIO_PYTHON_INSTALL_DIR}/opentimelineio")
|
|
endif()
|
|
endif()
|
|
|
|
if (WIN32)
|
|
string(REPLACE "\\" "/" OTIO_RESOLVED_PYTHON_INSTALL_DIR ${OTIO_RESOLVED_PYTHON_INSTALL_DIR})
|
|
endif()
|
|
+endif()
|
|
|
|
-else()
|
|
- set(OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")
|
|
+if(OTIO_CXX_INSTALL)
|
|
+ include(GNUInstallDirs)
|
|
+ set(OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
|
|
message(STATUS "OTIO C++ installing to ${CMAKE_INSTALL_PREFIX}")
|
|
endif()
|
|
|
|
diff --git a/src/opentime/CMakeLists.txt b/src/opentime/CMakeLists.txt
|
|
index b7cc47c..4022ba2 100644
|
|
--- a/src/opentime/CMakeLists.txt
|
|
+++ b/src/opentime/CMakeLists.txt
|
|
@@ -21,6 +21,7 @@ target_include_directories(opentime PRIVATE "${PROJECT_SOURCE_DIR}/src")
|
|
set_target_properties(opentime PROPERTIES
|
|
DEBUG_POSTFIX "${OTIO_DEBUG_POSTFIX}"
|
|
LIBRARY_OUTPUT_NAME "opentime"
|
|
+ VERSION "${OTIO_VERSION}"
|
|
POSITION_INDEPENDENT_CODE TRUE
|
|
WINDOWS_EXPORT_ALL_SYMBOLS true)
|
|
|
|
@@ -49,7 +50,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 "${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/cmake/opentime"
|
|
NAMESPACE OTIO:: )
|
|
|
|
include(CMakePackageConfigHelpers)
|
|
@@ -57,7 +58,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
|
|
+ ${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/cmake/opentime
|
|
NO_SET_AND_CHECK_MACRO
|
|
NO_CHECK_REQUIRED_COMPONENTS_MACRO
|
|
)
|
|
@@ -66,7 +67,7 @@ if(OTIO_CXX_INSTALL)
|
|
FILES
|
|
${CMAKE_CURRENT_BINARY_DIR}/OpenTimeConfig.cmake
|
|
DESTINATION
|
|
- ${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentime
|
|
+ ${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/cmake/opentime
|
|
)
|
|
endif()
|
|
|
|
diff --git a/src/opentimelineio/CMakeLists.txt b/src/opentimelineio/CMakeLists.txt
|
|
index 4b08e6d..4d3bd0d 100644
|
|
--- a/src/opentimelineio/CMakeLists.txt
|
|
+++ b/src/opentimelineio/CMakeLists.txt
|
|
@@ -90,6 +90,7 @@ target_link_libraries(opentimelineio
|
|
set_target_properties(opentimelineio PROPERTIES
|
|
DEBUG_POSTFIX "${OTIO_DEBUG_POSTFIX}"
|
|
LIBRARY_OUTPUT_NAME "opentimelineio"
|
|
+ VERSION "${OTIO_VERSION}"
|
|
POSITION_INDEPENDENT_CODE TRUE
|
|
WINDOWS_EXPORT_ALL_SYMBOLS true)
|
|
|
|
@@ -124,7 +125,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 "${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/cmake/opentimelineio"
|
|
NAMESPACE OTIO:: )
|
|
|
|
include(CMakePackageConfigHelpers)
|
|
@@ -132,7 +133,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
|
|
+ ${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/cmake/opentimelineio
|
|
NO_SET_AND_CHECK_MACRO
|
|
NO_CHECK_REQUIRED_COMPONENTS_MACRO
|
|
)
|
|
@@ -141,6 +142,6 @@ if(OTIO_CXX_INSTALL)
|
|
FILES
|
|
${CMAKE_CURRENT_BINARY_DIR}/OpenTimelineIOConfig.cmake
|
|
DESTINATION
|
|
- ${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentimelineio
|
|
+ ${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/cmake/opentimelineio
|
|
)
|
|
endif()
|