Merge lp:~albaguirre/unity-mir/cross-compile-link-fix into lp:unity-mir

[Alberto Aguirre]

[cmake] Use XXX_LDFLAGS for libraries found with pkg_check_modules.

Using the pkg given LDFLAGS resolves linking issues when cross-compiling

[cmake] Use XXX_LDFLAGS for libraries found with pkg_check_modules.

Using the pkg given LDFLAGS resolves linking issues when cross-compiling as the libraries will not be in /usr/lib/...
but rather in some ${PREFIX}/usr/lib/...

pkg-config returns the correct path in to cmake in XXX_LDFLAGS, but the target cmake recipe linking the libraries has to use them.

[Gerry Boland (gerboland)]

Is there any point in having the *_LIBRARIES variables at all?

review: Needs Information

[Gerry Boland (gerboland)]

Seems there is, approving

review: Approve

[Gerry Boland (gerboland)]

Yeah that makes sense now.

review: Approve

[Alberto Aguirre (albaguirre)]

> Is there any point in having the *_LIBRARIES variables at all?

Nope no reason.

[Gerry Boland (gerboland)]

@Alberto: please add in the description the review checklist questions & your answers from https://wiki.ubuntu.com/Process/Merges/Checklists/Unity-Mir

Here's my corresponding review checklist:

• Did you perform an exploratory manual test run of the code change and any related functionality?
Just build script fixes, no code change. Resulting package works

• Did CI run pass? If not, please explain why.
It did

[Alberto Aguirre (albaguirre)]

Did you perform an exploratory manual test run of the code change and any related functionality?
Tested that code still compiled correctly and ran with unity8.

 * Did CI run pass? If not, please explain why.
The Jenkins bot in the reviewer section seems stuck so I don't know if CI run passed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:184
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/258/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/121/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/122/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/121/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/258/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:184
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/265/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/129
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/129/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/128

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/265/rebuild

review: Approve (continuous-integration)

[Alberto Aguirre (albaguirre)]

Did you perform an exploratory manual test run of the code change and any related functionality?
Tested that code still compiled correctly and ran with unity8.

 * Did CI run pass? If not, please explain why.
Yes

=== modified file 'src/modules/Unity/Application/CMakeLists.txt'
--- src/modules/Unity/Application/CMakeLists.txt	2014-01-27 11:29:44 +0000
+++ src/modules/Unity/Application/CMakeLists.txt	2014-02-21 21:45:23 +0000
@@ -74,12 +74,10 @@
   ${CMAKE_THREAD_LIBS_INIT}
 
   ${GLIB_LDFLAGS}
-  ${UBUNTU_PLATFORM_API_LIBRARIES}
-  ${MIRCOMMON_LIBRARIES}
-  ${MIRSERVER_LIBRARIES}
-  ${PROCESS_CPP_LIBRARIES}
-  ${UBUNTU_PLATFORM_API_LIBRARIES}
-  ${UPSTART_APP_LAUNCH_LIBRARIES}
+  ${UBUNTU_PLATFORM_API_LDFLAGS}
+  ${MIRSERVER_LDFLAGS}
+  ${PROCESS_CPP_LDFLAGS}
+  ${UPSTART_APP_LAUNCH_LDFLAGS}
 
   ubuntu_application_api_mirserver
 )

=== modified file 'src/unity-mir/CMakeLists.txt'
--- src/unity-mir/CMakeLists.txt	2014-02-07 16:10:12 +0000
+++ src/unity-mir/CMakeLists.txt	2014-02-21 21:45:23 +0000
@@ -73,10 +73,8 @@
   Qt5::DBus
 
   ${CMAKE_THREAD_LIBS_INIT}
-
-  ${UBUNTU_PLATFORM_API_LIBRARIES}
-  ${MIRCOMMON_LIBRARIES}
-  ${MIRSERVER_LIBRARIES}
+  ${UBUNTU_PLATFORM_API_LDFLAGS}
+  ${MIRSERVER_LDFLAGS}
   ${PROTOBUF_LIBRARIES}
 
   boost_system

=== modified file 'tests/auto/modules/Unity/Application/CMakeLists.txt'
--- tests/auto/modules/Unity/Application/CMakeLists.txt	2014-01-27 11:29:44 +0000
+++ tests/auto/modules/Unity/Application/CMakeLists.txt	2014-02-21 21:45:23 +0000
@@ -19,8 +19,8 @@
     unity-mir
     unityapplicationplugin
 
-    ${MIRSERVER_LIBRARIES}
-    ${UPSTART_APP_LAUNCH_LIBRARIES})
+    ${MIRSERVER_LDFLAGS}
+    ${UPSTART_APP_LAUNCH_LDFLAGS})
 
 install(
     TARGETS unity-mir-test-app