summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2011-01-25 23:50:34 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2011-01-25 23:50:34 +0800
commit87b6f540a8b6c30cdc8d2619d63c5e7d03739f57 (patch)
treefdec13d30d2d01a03afaa62a217c2d1da96307a8
parentcd3aef51b210e78050c722f470a6cd90a8b43117 (diff)
parent41d6694dc9d1442a183ead0bd126f73c91ac7392 (diff)
downloadmobileperf-87b6f540a8b6c30cdc8d2619d63c5e7d03739f57.tar.gz
mobileperf-87b6f540a8b6c30cdc8d2619d63c5e7d03739f57.tar.bz2
Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
-rw-r--r--plugins/decor/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/decor/CMakeLists.txt b/plugins/decor/CMakeLists.txt
index b912b74..b0ca09a 100644
--- a/plugins/decor/CMakeLists.txt
+++ b/plugins/decor/CMakeLists.txt
@@ -5,10 +5,10 @@ include (CompizCommon)
compiz_plugin(decor PLUGINDEPS composite opengl LIBRARIES decoration)
-if (COMPIZ_BUILD_WITH_RPATH)
+if (COMPIZ_BUILD_WITH_RPATH AND NOT COMPIZ_DISABLE_PLUGIN_DECOR)
set_target_properties (
decor PROPERTIES
INSTALL_RPATH "${COMPIZ_LIBDIR}"
)
-endif (COMPIZ_BUILD_WITH_RPATH)
+endif (COMPIZ_BUILD_WITH_RPATH AND NOT COMPIZ_DISABLE_PLUGIN_DECOR)