Compiz

Merge lp:~compiz-team/compiz/compiz.fix_1005008 into lp:compiz/0.9.8

  1. compiz.fix_1005008
  2. Merge into 0.9.8
Proposed by Sam Spilsbury
Status: Merged
Merged at revision: 3228
Proposed branch: lp:~compiz-team/compiz/compiz.fix_1005008
Merge into: lp:compiz/0.9.8
Diff against target: 21 lines (+8/-6)
1 file modified
plugins/ccp/CMakeLists.txt (+8/-6)
To merge this branch: bzr merge lp:~compiz-team/compiz/compiz.fix_1005008
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
Review via email: mp+107536@code.launchpad.net

Description of the change

Don't set_target_properties on a target that might not exist

To post a comment you must log in.
Revision history for this message
Daniel van Vugt (vanvugt) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/ccp/CMakeLists.txt'
2--- plugins/ccp/CMakeLists.txt 2012-05-21 09:36:37 +0000
3+++ plugins/ccp/CMakeLists.txt 2012-05-26 23:34:25 +0000
4@@ -2,9 +2,11 @@
5
6 compiz_plugin (ccp LIBRARIES compizconfig CFLAGSADD -I${CMAKE_SOURCE_DIR}/compizconfig/libcompizconfig/include)
7
8-if (COMPIZ_BUILD_WITH_RPATH)
9- set_target_properties (
10- ccp PROPERTIES
11- INSTALL_RPATH "${COMPIZCONFIG_LIBDIR}"
12- )
13-endif (COMPIZ_BUILD_WITH_RPATH)
14+if (NOT COMPIZ_DISABLE_PLUGIN_CCP)
15+ if (COMPIZ_BUILD_WITH_RPATH)
16+ set_target_properties (
17+ ccp PROPERTIES
18+ INSTALL_RPATH "${COMPIZCONFIG_LIBDIR}"
19+ )
20+ endif (COMPIZ_BUILD_WITH_RPATH)
21+endif (NOT COMPIZ_DISABLE_PLUGIN_CCP)

Subscribers

People subscribed via source and target branches