summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2011-07-08 00:59:41 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2011-07-08 00:59:41 +0800
commitbeaa6a8524ed39dda6af5057ab9016c07c92368d (patch)
tree5a06dee4e67fc4582933328e0fe889d5664a772f /include
parentee98496d5d7042d4aba10d822901aac6d3b85111 (diff)
parente43159f29e1bace3acd99ff927c689e9dc8c341f (diff)
downloadmobileperf-beaa6a8524ed39dda6af5057ab9016c07c92368d.tar.gz
mobileperf-beaa6a8524ed39dda6af5057ab9016c07c92368d.tar.bz2
Merge in lp:~smspillaz/compiz-core/compiz-core.dist-buildsystem and turn
CTest on by default for everything
Diffstat (limited to 'include')
-rw-r--r--include/compiz-common.h.in6
-rw-r--r--include/core/CMakeLists.txt3
2 files changed, 4 insertions, 5 deletions
diff --git a/include/compiz-common.h.in b/include/compiz-common.h.in
index ca09527..7f98025 100644
--- a/include/compiz-common.h.in
+++ b/include/compiz-common.h.in
@@ -1,9 +1,5 @@
#ifndef COMPIZ_COMMON_H
#define COMPIZ_COMMON_H
-#define COMPIZ_VERSION_MAJOR @COMPIZ_VERSION_MAJOR@
-#define COMPIZ_VERSION_MINOR @COMPIZ_VERSION_MINOR@
-#define COMPIZ_VERSION_MICRO @COMPIZ_VERSION_MICRO@
-
-#define COMPIZ_VERSION_STRING "@COMPIZ_VERSION_MAJOR@.@COMPIZ_VERSION_MINOR@.@COMPIZ_VERSION_MICRO@"
+#define COMPIZ_VERSION_STRING "@VERSION@"
#endif
diff --git a/include/core/CMakeLists.txt b/include/core/CMakeLists.txt
index f541c9c..16ec1a5 100644
--- a/include/core/CMakeLists.txt
+++ b/include/core/CMakeLists.txt
@@ -13,13 +13,16 @@ set (_headers
pluginclasshandler.h
pluginclasses.h
propertywriter.h
+ privateunion.h
rect.h
region.h
screen.h
serialization.h
session.h
size.h
+ timeouthandler.h
timer.h
+ valueholder.h
window.h
wrapsystem.h
)