From 915e13f4cec9b930421f47e1a354519f8ddde3e7 Mon Sep 17 00:00:00 2001 From: Kirill Kirilenko Date: Mon, 19 Aug 2024 19:39:10 +0300 Subject: [PATCH] Make installation directory be relocatable (replace hard-coded paths in CMake configs with dynamic ones). --- libwebrtc/CMakeLists.txt | 3 +-- libwebrtc/LibWebRTCConfig.cmake.in | 2 +- .../{LibWebRTCTargets.cmake.in => LibWebRTCTargets.cmake} | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) rename libwebrtc/{LibWebRTCTargets.cmake.in => LibWebRTCTargets.cmake} (97%) diff --git a/libwebrtc/CMakeLists.txt b/libwebrtc/CMakeLists.txt index 1e2316e..fa8ca35 100644 --- a/libwebrtc/CMakeLists.txt +++ b/libwebrtc/CMakeLists.txt @@ -5,7 +5,6 @@ endif () # Prepare CMake exports configure_file(LibWebRTCConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LibWebRTCConfig.cmake @ONLY) configure_file(LibWebRTCConfigVersion.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LibWebRTCConfigVersion.cmake @ONLY) -configure_file(LibWebRTCTargets.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LibWebRTCTargets.cmake @ONLY) ###################### # INSTALL SECTION @@ -87,7 +86,7 @@ install(FILES UseLibWebRTC.cmake ${CMAKE_CURRENT_BINARY_DIR}/LibWebRTCConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/LibWebRTCConfigVersion.cmake - ${CMAKE_CURRENT_BINARY_DIR}/LibWebRTCTargets.cmake + ${CMAKE_CURRENT_SOURCE_DIR}/LibWebRTCTargets.cmake DESTINATION "lib/cmake/LibWebRTC" COMPONENT common ) diff --git a/libwebrtc/LibWebRTCConfig.cmake.in b/libwebrtc/LibWebRTCConfig.cmake.in index 04c116b..2e658a6 100644 --- a/libwebrtc/LibWebRTCConfig.cmake.in +++ b/libwebrtc/LibWebRTCConfig.cmake.in @@ -36,7 +36,7 @@ set(LIBWEBRTC_DEFINITIONS_DEBUG "@LIBWEBRTC_DEFINITIONS_DEBUG@") set(LIBWEBRTC_DEFINITIONS_RELEASE "@LIBWEBRTC_DEFINITIONS_RELEASE@") # The location of the UseLibWebRTC.cmake file. -set(LIBWEBRTC_CMAKE_DIR "@CMAKE_INSTALL_PREFIX@/lib/cmake/LibWebRTC") +set(LIBWEBRTC_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}") set(LIBWEBRTC_USE_FILE "${LIBWEBRTC_CMAKE_DIR}/UseLibWebRTC.cmake") # Import LibWebRTC targets. diff --git a/libwebrtc/LibWebRTCTargets.cmake.in b/libwebrtc/LibWebRTCTargets.cmake similarity index 97% rename from libwebrtc/LibWebRTCTargets.cmake.in rename to libwebrtc/LibWebRTCTargets.cmake index 8344069..8dd8229 100644 --- a/libwebrtc/LibWebRTCTargets.cmake.in +++ b/libwebrtc/LibWebRTCTargets.cmake @@ -37,7 +37,7 @@ unset(_expectedTargets) # The installation prefix configured by this project. -set(_IMPORT_PREFIX "@CMAKE_INSTALL_PREFIX@") +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_DIR}/../../.." ABSOLUTE) # Create imported target webrtc add_library(webrtc STATIC IMPORTED)