aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES1
-rw-r--r--Makefile.am4
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 80a01d4a..ba7cfc41 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ Changes for 1.6.0:
the class body.
* New matchers: Pointwise(), Each().
* New actions: ReturnPointee() and ReturnRefOfCopy().
+* CMake support.
* Project files for Visual Studio 2010.
* AllOf() and AnyOf() can handle up-to 10 arguments now.
* Google Mock doctor understands Clang error messages now.
diff --git a/Makefile.am b/Makefile.am
index e02c07e1..cf7dee92 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -153,6 +153,10 @@ EXTRA_DIST += \
scripts/generator/cpp/utils.py \
scripts/generator/gmock_gen.py
+# CMake scripts.
+EXTRA_DIST += \
+ CMakeLists.txt
+
# Microsoft Visual Studio 2005 projects.
EXTRA_DIST += \
msvc/2005/gmock.sln \