summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDidier Roche <didrocks@ubuntu.com>2010-12-13 10:41:01 +0100
committerDidier Roche <didrocks@ubuntu.com>2010-12-13 10:43:01 +0100
commit8dd7395415306d0e060ab48584e084eeef64d918 (patch)
tree7e9d09a90f8900d0d5c205ce6b5ae6da7fb48c2d
parent3c757a9e591d645a0e0d537382a1261b2cb8500b (diff)
downloadcompiz-with-glib-mainloop-8dd7395415306d0e060ab48584e084eeef64d918.tar.gz
compiz-with-glib-mainloop-8dd7395415306d0e060ab48584e084eeef64d918.tar.bz2
package mode is release debug for plugins
also ship the slipped gconf cmake helper
-rw-r--r--cmake/CMakeLists.txt1
-rw-r--r--cmake/CompizPlugin.cmake4
2 files changed, 4 insertions, 1 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 71130a8..887d86e 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -18,6 +18,7 @@ list (APPEND _PluginExtensionFiles
if (USE_GCONF)
list (APPEND _files CompizGconf.cmake)
+ list (APPEND _PluginExtensionFiles plugin_extensions/CompizGenGconf.cmake)
endif (USE_GCONF)
install (
diff --git a/cmake/CompizPlugin.cmake b/cmake/CompizPlugin.cmake
index 047ddd7..10a4a6f 100644
--- a/cmake/CompizPlugin.cmake
+++ b/cmake/CompizPlugin.cmake
@@ -108,7 +108,9 @@ macro (_prepare_directories)
set (PLUGIN_PKGDIR ${libdir}/pkgconfig)
set (PLUGIN_XMLDIR ${datadir}/compiz)
-
+ if (NOT "${CMAKE_BUILD_TYPE}")
+ set (CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Build type (Debug/Release/RelWithDebInfo/MinSizeRe)" FORCE)
+ endif (NOT "${CMAKE_BUILD_TYPE}")
elseif ("${COMPIZ_PLUGIN_INSTALL_TYPE}" STREQUAL "compiz" OR
"$ENV{BUILD_GLOBAL}" STREQUAL "true")
set (PLUGIN_BUILDTYPE global)