mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-04-05 08:17:14 +02:00
154 lines
4.4 KiB
Diff
154 lines
4.4 KiB
Diff
From b51ac0fd6e1def9ef005849640cf33bd2f2cd53e Mon Sep 17 00:00:00 2001
|
|
From: OPNA2608 <opna2608@protonmail.com>
|
|
Date: Mon, 20 Jan 2025 19:06:54 +0100
|
|
Subject: [PATCH 3/3] treewide: Switch to glog CMake module
|
|
|
|
---
|
|
CMakeLists.txt | 2 +-
|
|
src/common/priv/CMakeLists.txt | 2 +-
|
|
src/common/public/CMakeLists.txt | 2 +-
|
|
src/downloads/daemon/CMakeLists.txt | 2 +-
|
|
src/downloads/priv/CMakeLists.txt | 2 +-
|
|
src/downloads/qml/CMakeLists.txt | 2 +-
|
|
src/downloads/test-daemon/CMakeLists.txt | 2 +-
|
|
src/extractor/CMakeLists.txt | 2 +-
|
|
src/uploads/daemon/CMakeLists.txt | 2 +-
|
|
src/uploads/priv/CMakeLists.txt | 2 +-
|
|
10 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index c183b3d2..ff3e0a15 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -50,10 +50,10 @@ set(CMAKE_AUTOMOC ON)
|
|
|
|
find_package(Qt5 COMPONENTS Core DBus Network Sql Test REQUIRED)
|
|
find_package(Boost COMPONENTS log program_options REQUIRED)
|
|
+find_package(glog REQUIRED)
|
|
|
|
find_package(PkgConfig REQUIRED)
|
|
pkg_check_modules(DBUS REQUIRED dbus-1)
|
|
-pkg_check_modules(GLOG REQUIRED libglog)
|
|
pkg_check_modules(LOMIRI_API REQUIRED liblomiri-api)
|
|
|
|
if(USE_SYSTEMD)
|
|
diff --git a/src/common/priv/CMakeLists.txt b/src/common/priv/CMakeLists.txt
|
|
index fe0596a4..9f743166 100644
|
|
--- a/src/common/priv/CMakeLists.txt
|
|
+++ b/src/common/priv/CMakeLists.txt
|
|
@@ -75,7 +75,7 @@ set_target_properties(
|
|
|
|
target_link_libraries(${TARGET}
|
|
${LOMIRI_API_LDFLAGS}
|
|
- ${GLOG_LIBRARIES}
|
|
+ glog::glog
|
|
Qt5::Network
|
|
Qt5::Sql
|
|
Qt5::Core
|
|
diff --git a/src/common/public/CMakeLists.txt b/src/common/public/CMakeLists.txt
|
|
index 95738aa7..189ae134 100644
|
|
--- a/src/common/public/CMakeLists.txt
|
|
+++ b/src/common/public/CMakeLists.txt
|
|
@@ -50,7 +50,7 @@ set_target_properties(
|
|
)
|
|
|
|
target_link_libraries(${TARGET}
|
|
- ${GLOG_LIBRARIES}
|
|
+ glog::glog
|
|
Qt5::DBus
|
|
Qt5::Network
|
|
)
|
|
diff --git a/src/downloads/daemon/CMakeLists.txt b/src/downloads/daemon/CMakeLists.txt
|
|
index a0e94a74..a441a819 100644
|
|
--- a/src/downloads/daemon/CMakeLists.txt
|
|
+++ b/src/downloads/daemon/CMakeLists.txt
|
|
@@ -16,7 +16,7 @@ add_executable(${TARGET}
|
|
)
|
|
|
|
target_link_libraries(${TARGET}
|
|
- ${GLOG_LIBRARIES}
|
|
+ glog::glog
|
|
Qt5::Core
|
|
ldm-common
|
|
ldm-priv-common
|
|
diff --git a/src/downloads/priv/CMakeLists.txt b/src/downloads/priv/CMakeLists.txt
|
|
index 40b1093d..37c0d6c5 100644
|
|
--- a/src/downloads/priv/CMakeLists.txt
|
|
+++ b/src/downloads/priv/CMakeLists.txt
|
|
@@ -65,7 +65,7 @@ set_target_properties(
|
|
)
|
|
|
|
target_link_libraries(${TARGET}
|
|
- ${GLOG_LIBRARIES}
|
|
+ glog::glog
|
|
Qt5::DBus
|
|
Qt5::Sql
|
|
ldm-common
|
|
diff --git a/src/downloads/qml/CMakeLists.txt b/src/downloads/qml/CMakeLists.txt
|
|
index 7e2d9285..49d68f1c 100644
|
|
--- a/src/downloads/qml/CMakeLists.txt
|
|
+++ b/src/downloads/qml/CMakeLists.txt
|
|
@@ -34,7 +34,7 @@ find_package(Qt5 COMPONENTS Core Qml Quick REQUIRED)
|
|
target_link_libraries(${TARGET} Qt5::Core Qt5::Qml Qt5::Quick)
|
|
|
|
target_link_libraries(${TARGET}
|
|
- ${GLOG_LIBRARIES}
|
|
+ glog::glog
|
|
ldm-common
|
|
lomiri-download-manager-common
|
|
lomiri-download-manager-client
|
|
diff --git a/src/downloads/test-daemon/CMakeLists.txt b/src/downloads/test-daemon/CMakeLists.txt
|
|
index d12207a1..6734e65d 100644
|
|
--- a/src/downloads/test-daemon/CMakeLists.txt
|
|
+++ b/src/downloads/test-daemon/CMakeLists.txt
|
|
@@ -30,7 +30,7 @@ add_executable(${TARGET}
|
|
)
|
|
|
|
target_link_libraries(${TARGET}
|
|
- ${GLOG_LIBRARIES}
|
|
+ glog::glog
|
|
Qt5::Core
|
|
Qt5::DBus
|
|
Qt5::Network
|
|
diff --git a/src/extractor/CMakeLists.txt b/src/extractor/CMakeLists.txt
|
|
index 9efc64ed..569ad51b 100644
|
|
--- a/src/extractor/CMakeLists.txt
|
|
+++ b/src/extractor/CMakeLists.txt
|
|
@@ -23,7 +23,7 @@ add_executable(${TARGET}
|
|
)
|
|
|
|
target_link_libraries(${TARGET}
|
|
- ${GLOG_LIBRARIES}
|
|
+ glog::glog
|
|
Qt5::Core
|
|
${Boost_LIBRARIES}
|
|
ldm-priv-common
|
|
diff --git a/src/uploads/daemon/CMakeLists.txt b/src/uploads/daemon/CMakeLists.txt
|
|
index 9731899d..08238537 100644
|
|
--- a/src/uploads/daemon/CMakeLists.txt
|
|
+++ b/src/uploads/daemon/CMakeLists.txt
|
|
@@ -16,7 +16,7 @@ add_executable(${TARGET}
|
|
)
|
|
|
|
target_link_libraries(${TARGET}
|
|
- ${GLOG_LIBRARIES}
|
|
+ glog::glog
|
|
Qt5::Core
|
|
ldm-common
|
|
ldm-priv-common
|
|
diff --git a/src/uploads/priv/CMakeLists.txt b/src/uploads/priv/CMakeLists.txt
|
|
index dff67e35..672e49ef 100644
|
|
--- a/src/uploads/priv/CMakeLists.txt
|
|
+++ b/src/uploads/priv/CMakeLists.txt
|
|
@@ -47,7 +47,7 @@ set_target_properties(
|
|
)
|
|
|
|
target_link_libraries(${TARGET}
|
|
- ${GLOG_LIBRARIES}
|
|
+ glog::glog
|
|
Qt5::DBus
|
|
Qt5::Sql
|
|
ldm-common
|
|
--
|
|
2.48.0
|
|
|