[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [discover/Plasma/5.10] libdiscover/backends/SnapBackend: Rename the generic snap library to Discover
From:       Aleix Pol <null () kde ! org>
Date:       2017-06-01 0:02:30
Message-ID: E1dGDZO-00007j-QE () code ! kde ! org
[Download RAW message or body]

Git commit d3975092b9ea9aab00bf194bcf0820bbff5050a8 by Aleix Pol.
Committed on 31/05/2017 at 23:59.
Pushed by apol into branch 'Plasma/5.10'.

Rename the generic snap library to DiscoverSnapClient

Hopefully makes Ubuntu happy :)

BUG: 380356

M  +1    -1    libdiscover/backends/SnapBackend/CMakeLists.txt
M  +4    -4    libdiscover/backends/SnapBackend/libsnapclient/CMakeLists.txt
M  +1    -1    libdiscover/backends/SnapBackend/tests/CMakeLists.txt

https://commits.kde.org/discover/d3975092b9ea9aab00bf194bcf0820bbff5050a8

diff --git a/libdiscover/backends/SnapBackend/CMakeLists.txt b/libdiscover/=
backends/SnapBackend/CMakeLists.txt
index c0e9e090..40fd6539 100644
--- a/libdiscover/backends/SnapBackend/CMakeLists.txt
+++ b/libdiscover/backends/SnapBackend/CMakeLists.txt
@@ -2,7 +2,7 @@ add_subdirectory(tests)
 add_subdirectory(libsnapclient)
 =

 add_library(snap-backend MODULE SnapResource.cpp SnapBackend.cpp SnapRevie=
wsBackend.cpp SnapTransaction.cpp)
-target_link_libraries(snap-backend Qt5::Core KF5::CoreAddons KF5::ConfigCo=
re Discover::Common Snap::Client)
+target_link_libraries(snap-backend Qt5::Core KF5::CoreAddons KF5::ConfigCo=
re Discover::Common Discover::SnapClient)
 =

 install(TARGETS snap-backend DESTINATION ${PLUGIN_INSTALL_DIR}/discover)
 install(FILES snap-backend-categories.xml DESTINATION ${DATA_INSTALL_DIR}/=
libdiscover/categories)
diff --git a/libdiscover/backends/SnapBackend/libsnapclient/CMakeLists.txt =
b/libdiscover/backends/SnapBackend/libsnapclient/CMakeLists.txt
index 943f2c64..000b75b5 100644
--- a/libdiscover/backends/SnapBackend/libsnapclient/CMakeLists.txt
+++ b/libdiscover/backends/SnapBackend/libsnapclient/CMakeLists.txt
@@ -1,7 +1,7 @@
-add_library(SnapClient SnapSocket.cpp)
-target_link_libraries(SnapClient PUBLIC Qt5::Network KF5::Auth)
-add_library(Snap::Client ALIAS SnapClient)
-install(TARGETS SnapClient DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
+add_library(DiscoverSnapClient SnapSocket.cpp)
+target_link_libraries(DiscoverSnapClient PUBLIC Qt5::Network KF5::Auth)
+add_library(Discover::SnapClient ALIAS DiscoverSnapClient)
+install(TARGETS DiscoverSnapClient DESTINATION ${INSTALL_TARGETS_DEFAULT_A=
RGS})
 =

 add_executable(libsnap_helper SnapAuthHelper.cpp)
 target_link_libraries(libsnap_helper Qt5::Network KF5::Auth)
diff --git a/libdiscover/backends/SnapBackend/tests/CMakeLists.txt b/libdis=
cover/backends/SnapBackend/tests/CMakeLists.txt
index 79daec0d..ac9ee29a 100644
--- a/libdiscover/backends/SnapBackend/tests/CMakeLists.txt
+++ b/libdiscover/backends/SnapBackend/tests/CMakeLists.txt
@@ -1,2 +1,2 @@
-set(EXTRA_LIBS Snap::Client)
+set(EXTRA_LIBS Discover::SnapClient)
 add_unit_test(snaptest SnapTest.cpp)
[prev in list] [next in list] [prev in thread] [next in thread]