summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <smspillaz@gmail.com>2010-12-13 21:10:33 +0800
committerSam Spilsbury <smspillaz@gmail.com>2010-12-13 21:10:33 +0800
commit1647f9f9f74b2e396a2b32ccdac81b955bc84aa6 (patch)
tree3eeb7aecc8b69c582ed4ddec815dd63178093250
parentda624e3171310d70bd7bfdd8a81b1d88f378a7e6 (diff)
parent8dd7395415306d0e060ab48584e084eeef64d918 (diff)
downloadcompiz-with-glib-mainloop-1647f9f9f74b2e396a2b32ccdac81b955bc84aa6.tar.gz
compiz-with-glib-mainloop-1647f9f9f74b2e396a2b32ccdac81b955bc84aa6.tar.bz2
Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
-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)