From 648ac42ae79173869e41a3000892a39585b7fcc6 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Thu, 7 Dec 2017 13:40:57 -0500 Subject: [PATCH 1/2] [PATCH] Don't set rpath https://github.com/google/woff2/pull/106 Gbp-Pq: Name dont-set-rpath.patch --- CMakeLists.txt | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ecfbb83..da8ecf1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,16 +21,6 @@ option(NOISY_LOGGING "Noisy logging" ON) # Version information set(WOFF2_VERSION 1.0.2) -# When building shared libraries it is important to set the correct rpath -# See https://cmake.org/Wiki/CMake_RPATH_handling#Always_full_RPATH -set(CMAKE_SKIP_BUILD_RPATH FALSE) -set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) -set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_LIBDIR}" isSystemDir) -if ("${isSystemDir}" STREQUAL "-1") - set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}") -endif() - # Find Brotli dependencies set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") find_package(BrotliDec) From 184e3fc32c0488cd1226b99ed19f3f6f866d1c84 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Thu, 7 Dec 2017 17:18:05 -0500 Subject: [PATCH 2/2] [PATCH] Always install executables https://github.com/google/woff2/pull/106 Gbp-Pq: Name install-executables.patch --- CMakeLists.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index da8ecf1..6fb5bfe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -250,12 +250,10 @@ generate_pkg_config ("${CMAKE_CURRENT_BINARY_DIR}/libwoff2enc.pc" LIBRARIES woff2enc) # Installation -if (NOT BUILD_SHARED_LIBS) - install( - TARGETS woff2_decompress woff2_compress woff2_info - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" - ) -endif() +install( + TARGETS woff2_decompress woff2_compress woff2_info + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" +) install( TARGETS woff2common woff2dec woff2enc