summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Watkins <travis.watkins@linaro.org>2011-08-22 15:46:30 -0500
committerTravis Watkins <travis.watkins@linaro.org>2011-08-22 15:46:30 -0500
commit9fd0b94c600a451726e4b2124516afe3d32f13bc (patch)
treecc34d2f17592dcfc978e523d359061fed8b7c900
parent2e228a5d680275b834a2f0379840f2415b70bd16 (diff)
downloadmobileperf-9fd0b94c600a451726e4b2124516afe3d32f13bc.tar.gz
mobileperf-9fd0b94c600a451726e4b2124516afe3d32f13bc.tar.bz2
redisable unported plugins
-rw-r--r--CMakeLists.txt14
-rw-r--r--plugins/blur/CMakeLists.txt20
-rw-r--r--plugins/cube/CMakeLists.txt2
-rw-r--r--plugins/rotate/CMakeLists.txt2
-rw-r--r--plugins/water/CMakeLists.txt2
-rw-r--r--plugins/wobbly/CMakeLists.txt2
6 files changed, 14 insertions, 28 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf64669..3fdbd4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -103,13 +103,6 @@ install (
DESTINATION ${COMPIZ_DESTDIR}${libdir}/pkgconfig
)
-# temporarily disable plugins that aren't ported yed
-set (COMPIZ_DISABLE_PLUGIN_BLUR ON)
-set (COMPIZ_DISABLE_PLUGIN_CUBE ON)
-set (COMPIZ_DISABLE_PLUGIN_ROTATE ON)
-set (COMPIZ_DISABLE_PLUGIN_WATER ON)
-set (COMPIZ_DISABLE_PLUGIN_WOBBLY ON)
-
add_subdirectory (cmake)
add_subdirectory (include)
add_subdirectory (images)
@@ -138,10 +131,3 @@ _print_configure_results ()
_check_compiz_cmake_macro (${CMAKE_MODULE_PATH_ORIG})
-# temporarily disable plugins that aren't ported yed
-SET(COMPIZ_DISABLE_PLUGIN_BLUR "ON")
-SET(COMPIZ_DISABLE_PLUGIN_CUBE "ON")
-SET(COMPIZ_DISABLE_PLUGIN_ROTATE "ON")
-SET(COMPIZ_DISABLE_PLUGIN_WATER "ON")
-SET(COMPIZ_DISABLE_PLUGIN_WOBBLY "ON")
-
diff --git a/plugins/blur/CMakeLists.txt b/plugins/blur/CMakeLists.txt
index 55bb230..5529441 100644
--- a/plugins/blur/CMakeLists.txt
+++ b/plugins/blur/CMakeLists.txt
@@ -2,15 +2,15 @@ find_package (Compiz REQUIRED)
include (CompizPlugin)
-find_package (OpenGL)
+#find_package (OpenGL)
-if (OPENGL_GLU_FOUND)
- compiz_plugin(blur PLUGINDEPS composite opengl LIBRARIES decoration ${OPENGL_glu_LIBRARY} INCDIRS ${OPENGL_INCLUDE_DIR})
+#if (OPENGL_GLU_FOUND)
+# compiz_plugin(blur PLUGINDEPS composite opengl LIBRARIES decoration ${OPENGL_glu_LIBRARY} INCDIRS ${OPENGL_INCLUDE_DIR})
- if (COMPIZ_BUILD_WITH_RPATH AND NOT COMPIZ_DISABLE_PLUGIN_BLUR)
- set_target_properties (
- blur PROPERTIES
- INSTALL_RPATH "${COMPIZ_LIBDIR}"
- )
- endif (COMPIZ_BUILD_WITH_RPATH AND NOT COMPIZ_DISABLE_PLUGIN_BLUR)
-endif ()
+# if (COMPIZ_BUILD_WITH_RPATH AND NOT COMPIZ_DISABLE_PLUGIN_BLUR)
+# set_target_properties (
+# blur PROPERTIES
+# INSTALL_RPATH "${COMPIZ_LIBDIR}"
+# )
+# endif (COMPIZ_BUILD_WITH_RPATH AND NOT COMPIZ_DISABLE_PLUGIN_BLUR)
+#endif ()
diff --git a/plugins/cube/CMakeLists.txt b/plugins/cube/CMakeLists.txt
index 4d09af3..a3994c0 100644
--- a/plugins/cube/CMakeLists.txt
+++ b/plugins/cube/CMakeLists.txt
@@ -2,4 +2,4 @@ find_package (Compiz REQUIRED)
include (CompizPlugin)
-compiz_plugin(cube PLUGINDEPS composite opengl) \ No newline at end of file
+#compiz_plugin(cube PLUGINDEPS composite opengl)
diff --git a/plugins/rotate/CMakeLists.txt b/plugins/rotate/CMakeLists.txt
index bda1446..05a9a8f 100644
--- a/plugins/rotate/CMakeLists.txt
+++ b/plugins/rotate/CMakeLists.txt
@@ -2,4 +2,4 @@ find_package (Compiz REQUIRED)
include (CompizPlugin)
-compiz_plugin(rotate PLUGINDEPS composite opengl cube) \ No newline at end of file
+#compiz_plugin(rotate PLUGINDEPS composite opengl cube)
diff --git a/plugins/water/CMakeLists.txt b/plugins/water/CMakeLists.txt
index 2d2542b..f3f36ad 100644
--- a/plugins/water/CMakeLists.txt
+++ b/plugins/water/CMakeLists.txt
@@ -2,4 +2,4 @@ find_package (Compiz REQUIRED)
include (CompizPlugin)
-compiz_plugin(water PLUGINDEPS composite opengl) \ No newline at end of file
+#compiz_plugin(water PLUGINDEPS composite opengl)
diff --git a/plugins/wobbly/CMakeLists.txt b/plugins/wobbly/CMakeLists.txt
index 49886f8..415f6cb 100644
--- a/plugins/wobbly/CMakeLists.txt
+++ b/plugins/wobbly/CMakeLists.txt
@@ -2,4 +2,4 @@ find_package (Compiz REQUIRED)
include (CompizPlugin)
-compiz_plugin(wobbly PLUGINDEPS composite opengl)
+#compiz_plugin(wobbly PLUGINDEPS composite opengl)