summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <smspillaz@gmail.com>2010-05-19 15:39:53 +0000
committerLive session user <ubuntu@ubuntu.(none)>2010-05-19 15:40:46 +0000
commit6426b4cdc4a5928f8f617e35cc2cf9e398307927 (patch)
tree50404bff43eb126c43ca20f43e79ef4ba0a8a87e
parent2c3400a0c6cd4b203f6ac94d152edb2e0cf6dbf1 (diff)
downloadzcomp-6426b4cdc4a5928f8f617e35cc2cf9e398307927.tar.gz
zcomp-6426b4cdc4a5928f8f617e35cc2cf9e398307927.tar.bz2
Fix DESTDIR related typo
Ensure no rpath linkage in kde4-w-d gtk-w-d and blur
-rw-r--r--cmake/CompizPlugin.cmake1
-rw-r--r--cmake/base.cmake2
-rw-r--r--gtk/window-decorator/CMakeLists.txt4
-rw-r--r--kde/window-decorator-kde4/CMakeLists.txt5
-rw-r--r--plugins/blur/CMakeLists.txt13
5 files changed, 18 insertions, 7 deletions
diff --git a/cmake/CompizPlugin.cmake b/cmake/CompizPlugin.cmake
index 8d1e7b6..dac7616 100644
--- a/cmake/CompizPlugin.cmake
+++ b/cmake/CompizPlugin.cmake
@@ -393,6 +393,7 @@ function (_build_compiz_plugin plugin)
else (COMPIZ_BUILD_WITH_RPATH)
set_target_properties (
${plugin} PROPERTIES
+ INSTALL_RPATH_USE_LINK_PATH 0
SKIP_BUILD_RPATH 1
INSTALL_RPATH "${COMPIZ_LIBDIR}/compiz"
COMPILE_FLAGS "${${_PLUGIN}_CFLAGSADD}"
diff --git a/cmake/base.cmake b/cmake/base.cmake
index fe44c1c..05493d9 100644
--- a/cmake/base.cmake
+++ b/cmake/base.cmake
@@ -45,7 +45,7 @@ function (_check_compiz_cmake_macro)
endif ()
add_custom_target (
findcompiz_install
- ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${DESTDIR}${CMAKE_ROOT}/Modules
+ ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules
)
endfunction ()
diff --git a/gtk/window-decorator/CMakeLists.txt b/gtk/window-decorator/CMakeLists.txt
index cba5464..5182b3a 100644
--- a/gtk/window-decorator/CMakeLists.txt
+++ b/gtk/window-decorator/CMakeLists.txt
@@ -1,6 +1,8 @@
if (USE_GTK)
- set (CMAKE_INSTALL_RPATH ${libdir})
+ if (COMPIZ_BUILD_WITH_RPATH)
+ set (CMAKE_INSTALL_RPATH ${libdir})
+ endif (COMPIZ_BUILD_WITH_RPATH)
include_directories (
${compiz_SOURCE_DIR}/include
diff --git a/kde/window-decorator-kde4/CMakeLists.txt b/kde/window-decorator-kde4/CMakeLists.txt
index 51e0d50..45c7562 100644
--- a/kde/window-decorator-kde4/CMakeLists.txt
+++ b/kde/window-decorator-kde4/CMakeLists.txt
@@ -49,6 +49,11 @@ if (USE_KDE4)
${kwd4_SRCS}
)
+ set_target_properties (
+ kde4-window-decorator PROPERTIES
+ INSTALL_RPATH_USE_LINK_PATH 0
+ )
+
target_link_libraries (
kde4-window-decorator
decoration
diff --git a/plugins/blur/CMakeLists.txt b/plugins/blur/CMakeLists.txt
index 2761403..d625cdf 100644
--- a/plugins/blur/CMakeLists.txt
+++ b/plugins/blur/CMakeLists.txt
@@ -3,11 +3,14 @@ find_package (Compiz REQUIRED)
include (CompizPlugin)
find_package (OpenGL)
+
if (OPENGL_GLU_FOUND)
compiz_plugin(blur PLUGINDEPS composite opengl LIBRARIES decoration ${OPENGL_glu_LIBRARY} INCDIRS ${OPENGL_INCLUDE_DIR})
-
-set_target_properties (
- blur PROPERTIES
- INSTALL_RPATH "${COMPIZ_LIBDIR}"
-)
+
+ if (COMPIZ_BUILD_WITH_RPATH)
+ set_target_properties (
+ blur PROPERTIES
+ INSTALL_RPATH "${COMPIZ_LIBDIR}"
+ )
+ endif (COMPIZ_BUILD_WITH_RPATH)
endif ()