Transfer Indicator

Merge lp:~renatofilho/indicator-transfer/add-plugins-fix-build into lp:indicator-transfer/15.10

  1. add-plugins-fix-build
  2. Merge into trunk.15.10
Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Charles Kerr
Approved revision: 49
Merge reported by: Charles Kerr
Merged at revision: not available
Proposed branch: lp:~renatofilho/indicator-transfer/add-plugins-fix-build
Merge into: lp:indicator-transfer/15.10
Prerequisite: lp:~charlesk/indicator-transfer/add-plugins
Diff against target: 22 lines (+3/-2)
1 file modified
tests/CMakeLists.txt (+3/-2)
To merge this branch: bzr merge lp:~renatofilho/indicator-transfer/add-plugins-fix-build
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+266795@code.launchpad.net
To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:49
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~renatofilho/indicator-transfer/add-plugins-fix-build/+merge/266795/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/indicator-transfer-ci/29/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/11/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-transfer-ci/29/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/CMakeLists.txt'
2--- tests/CMakeLists.txt 2015-08-03 20:06:40 +0000
3+++ tests/CMakeLists.txt 2015-08-03 20:06:40 +0000
4@@ -16,7 +16,8 @@
5 set (CXX_WARNING_ARGS "${CXX_WARNING_ARGS} -Wno-global-constructors -Wno-weak-vtables -Wno-undef -Wno-c++98-compat-pedantic -Wno-missing-noreturn -Wno-used-but-marked-unused -Wno-padded -Wno-deprecated -Wno-sign-compare -Wno-shift-sign-overflow")
6 endif()
7
8-SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -g ${CXX_WARNING_ARGS}")
9+add_definitions(-fPIC)
10+SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -g ${CXX_WARNING_ARGS}")
11
12 # look for headers in our src dir, and also in the directories where we autogenerate files...
13 include_directories (${CMAKE_SOURCE_DIR}/src)
14@@ -33,7 +34,7 @@
15 add_valgrind_test_by_name(test-multisource)
16 add_valgrind_test_by_name(test-plugin-source)
17 set(PLUGIN_NAME "mock-source-plugin")
18-add_library(${PLUGIN_NAME} MODULE mock-source-plugin.cpp)
19+add_library(${PLUGIN_NAME} STATIC mock-source-plugin.cpp)
20 target_link_libraries(${PLUGIN_NAME} PRIVATE ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES})
21
22 function(add_test_by_name name)

Subscribers

People subscribed via source and target branches