Compiz

Merge lp:~compiz-team/compiz/compiz.fix_1084096 into lp:compiz/0.9.9

  1. compiz.fix_1084096
  2. Merge into 0.9.9
Proposed by Sam Spilsbury
Status: Merged
Approved by: Daniel van Vugt
Approved revision: 3487
Merged at revision: 3489
Proposed branch: lp:~compiz-team/compiz/compiz.fix_1084096
Merge into: lp:compiz/0.9.9
Diff against target: 15 lines (+5/-0)
1 file modified
tests/system/xorg-gtest/CMakeLists.txt (+5/-0)
To merge this branch: bzr merge lp:~compiz-team/compiz/compiz.fix_1084096
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
PS Jenkins bot (community) continuous-integration Approve
Andrea Azzarone Approve
Review via email: mp+136676@code.launchpad.net

Commit message

Strip trailing whitespace from pkg-config output (LP: #1084096)

Description of the change

Strip trailing whitespace from pkg-config output (LP: #1084096)

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote :

LGTM.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3487
http://jenkins.qa.ubuntu.com/job/compiz-ci/274/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/274/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/274//rebuild/?

review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Works for me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/system/xorg-gtest/CMakeLists.txt'
2--- tests/system/xorg-gtest/CMakeLists.txt 2012-09-18 13:17:09 +0000
3+++ tests/system/xorg-gtest/CMakeLists.txt 2012-11-28 14:37:28 +0000
4@@ -11,6 +11,11 @@
5 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=sourcedir xorg-gtest OUTPUT_VARIABLE _xorg_gtest_source_dir)
6 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=CPPflags xorg-gtest OUTPUT_VARIABLE _xorg_gtest_cflags)
7
8+ string (STRIP ${_xorg_gtest_prefix} _xorg_gtest_prefix)
9+ string (STRIP ${_xorg_gtest_include_dir} _xorg_gtest_include_dir)
10+ string (STRIP ${_xorg_gtest_source_dir} _xorg_gtest_source_dir)
11+ string (STRIP ${_xorg_gtest_cflags} _xorg_gtest_cflags)
12+
13 set (XORG_SERVER_INCLUDE_XORG_GTEST ${_xorg_gtest_include_dir} CACHE PATH "Path to Xorg GTest Headers")
14 set (XORG_SERVER_GTEST_SRC ${_xorg_gtest_source_dir} CACHE PATH "Path to Xorg GTest Sources")
15 set (COMPIZ_XORG_SYSTEM_TEST_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include CACHE PATH "Path to Compiz Xorg GTest Headers")

Subscribers

People subscribed via source and target branches