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
|
From: Alexandre Rossi <niol@zincube.net>
Date: Wed, 5 Jun 2024 22:17:16 +0200
Subject: Use system libraries instead embedded ones
Forwarded: https://github.com/transmission/transmission/pull/6900
---
cmake/FindFastFloat.cmake | 2 +-
cmake/FindFmt.cmake | 2 +-
cmake/FindRapidJSON.cmake | 2 +-
cmake/FindUtfCpp.cmake | 2 +-
tests/gtest/CMakeLists.txt | 8 ++++----
5 files changed, 8 insertions(+), 8 deletions(-)
--- transmission.git.orig/cmake/FindFastFloat.cmake 2025-11-06 14:56:35.244231440 +0100
+++ transmission.git/cmake/FindFastFloat.cmake 2025-11-06 14:56:35.240231365 +0100
@@ -2,4 +2,4 @@
target_include_directories(FastFloat::fast_float
INTERFACE
- ${TR_THIRD_PARTY_SOURCE_DIR}/fast_float/include)
+ /usr/include/fast_float/)
--- transmission.git.orig/cmake/FindFmt.cmake 2025-11-06 14:56:35.244231440 +0100
+++ transmission.git/cmake/FindFmt.cmake 2025-11-06 14:57:12.428926175 +0100
@@ -1,6 +1,6 @@
add_library(fmt::fmt-header-only INTERFACE IMPORTED)
-set(${CMAKE_FIND_PACKAGE_NAME}_INCLUDE "${TR_THIRD_PARTY_SOURCE_DIR}/fmt/include")
+set(${CMAKE_FIND_PACKAGE_NAME}_INCLUDE "/usr/include")
target_include_directories(fmt::fmt-header-only
INTERFACE
--- transmission.git.orig/cmake/FindRapidJSON.cmake 2025-11-06 14:56:35.244231440 +0100
+++ transmission.git/cmake/FindRapidJSON.cmake 2025-11-06 14:56:35.244231440 +0100
@@ -2,7 +2,7 @@
target_include_directories(RapidJSON
INTERFACE
- ${TR_THIRD_PARTY_SOURCE_DIR}/rapidjson/include)
+ /usr/include/rapidjson)
target_compile_definitions(RapidJSON
INTERFACE
--- transmission.git.orig/cmake/FindUtfCpp.cmake 2025-11-06 14:56:35.244231440 +0100
+++ transmission.git/cmake/FindUtfCpp.cmake 2025-11-06 14:56:35.244231440 +0100
@@ -2,4 +2,4 @@
target_include_directories(utf8::cpp
INTERFACE
- ${TR_THIRD_PARTY_SOURCE_DIR}/utfcpp/source)
+ /usr/include/utf8cpp)
--- transmission.git.orig/tests/gtest/CMakeLists.txt 2025-11-06 14:56:35.244231440 +0100
+++ transmission.git/tests/gtest/CMakeLists.txt 2025-11-06 14:56:35.244231440 +0100
@@ -12,8 +12,8 @@
target_sources(gtestall
PRIVATE
- ${GTEST_ROOT_DIR}/src/gtest-all.cc
- ${GTEST_ROOT_DIR}/src/gtest_main.cc)
+ /usr/src/googletest/googletest/src/gtest-all.cc
+ /usr/src/googletest/googletest/src/gtest_main.cc)
set_property(
TARGET gtestall
@@ -21,6 +21,6 @@
target_include_directories(gtestall SYSTEM
PRIVATE
- ${GTEST_ROOT_DIR}
+ /usr/src/googletest/googletest
PUBLIC
- ${GTEST_ROOT_DIR}/include)
+ /usr/src/googletest/googletest/include)
|