Merge lp:~3v1n0/ubuntu-system-settings/fix-system-update-linking into lp:ubuntu-system-settings

[Marco Trevisan (Treviño)]

system-update: properly set the ubuntu-downloader ldflags on plugin

 * Are there any related MPs required for this MP to build/function as expected? Please list.

Nope

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

No debian change here

 * If you changed the UI, has there been a design review?

N/A

[lp:~3v1n0/ubuntu-system-settings/fix-system-update-linking]

1674. By Marco Trevisan (Treviño) on 2016-07-20

system-update: properly set the ubuntu-downloader ldflags on plugin

[Jonas G. Drange (jonas-drange)]

Could you sync this with trunk?

[Marco Trevisan (Treviño) (3v1n0)]

I think this is not needed anymore as per the refactories that there have been recently, so closing this.

[Jonas G. Drange (jonas-drange)]

Did you mean to mark it as rejected, Marco? If that's not the case, let me know. But you're right, it seems to not be needed anymore.

Thanks either way.

[Marco Trevisan (Treviño) (3v1n0)]

Yeah, this is fine.
Thanks

Unmerged revisions

1674. By Marco Trevisan (Treviño) on 2016-07-20

system-update: properly set the ubuntu-downloader ldflags on plugin

=== modified file 'plugins/system-update/CMakeLists.txt'
--- plugins/system-update/CMakeLists.txt	2015-08-26 16:35:05 +0000
+++ plugins/system-update/CMakeLists.txt	2016-07-20 16:40:26 +0000
@@ -7,16 +7,10 @@
 qt5_use_modules(UbuntuUpdatePanel Qml Quick Network DBus)
 include_directories(/usr/include/apt-pkg/)
 
-pkg_check_modules(UBUNTU_DOWNLOAD_MANAGER_CLIENT REQUIRED ubuntu-download-manager-client)
-pkg_check_modules(UBUNTU_DOWNLOAD_MANAGER_COMMON REQUIRED ubuntu-download-manager-common)
-pkg_check_modules(UBUNTUONEAUTH REQUIRED ubuntuoneauth-2.0)
 add_definitions(${UBUNTUONEAUTH_CFLAGS} ${UBUNTUONEAUTH_CFLAGS_OTHER})
 target_link_libraries(UbuntuUpdatePanel
     apt-pkg
     update-plugin
-    ${UBUNTUONEAUTH_LDFLAGS}
-    ${UBUNTU_DOWNLOAD_MANAGER_CLIENT_LDFLAGS}
-    ${UBUNTU_DOWNLOAD_MANAGER_COMMON_LDFLAGS}
 )
 
 set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/Update)

=== modified file 'plugins/system-update/plugin/CMakeLists.txt'
--- plugins/system-update/plugin/CMakeLists.txt	2015-08-27 09:40:29 +0000
+++ plugins/system-update/plugin/CMakeLists.txt	2016-07-20 16:40:26 +0000
@@ -8,7 +8,15 @@
 qt5_use_modules(update-plugin Core Qml Quick Network DBus)
 include_directories(/usr/include/apt-pkg/)
 pkg_check_modules(UBUNTUONEAUTH REQUIRED ubuntuoneauth-2.0)
+pkg_check_modules(UBUNTU_DOWNLOAD_MANAGER_CLIENT REQUIRED ubuntu-download-manager-client)
+pkg_check_modules(UBUNTU_DOWNLOAD_MANAGER_COMMON REQUIRED ubuntu-download-manager-common)
 add_definitions(${UBUNTUONEAUTH_CFLAGS} ${UBUNTUONEAUTH_CFLAGS_OTHER})
 
-target_link_libraries(update-plugin SystemSettings apt-pkg ${UBUNTUONEAUTH_LDFLAGS})
+target_link_libraries(update-plugin
+    SystemSettings
+    apt-pkg
+    ${UBUNTUONEAUTH_LDFLAGS}
+    ${UBUNTU_DOWNLOAD_MANAGER_CLIENT_LDFLAGS}
+    ${UBUNTU_DOWNLOAD_MANAGER_COMMON_LDFLAGS}
+)
 install(TARGETS update-plugin DESTINATION ${PLUGIN_MODULE_DIR})