aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2011-02-24 21:59:54 +0000
committerzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2011-02-24 21:59:54 +0000
commit62a35fbc5d316c4f82f37cb6e183eb8de210a94c (patch)
tree71aadb86b67dde4e64c425aef9e5b1b625f34345
parent79d82b6ef75c470e1bc2fd61a8cfd1671ca19aee (diff)
downloadgoogletest-62a35fbc5d316c4f82f37cb6e183eb8de210a94c.tar.gz
googletest-62a35fbc5d316c4f82f37cb6e183eb8de210a94c.tar.bz2
googletest-62a35fbc5d316c4f82f37cb6e183eb8de210a94c.zip
Adds CMake scripts to gmock's release package.
-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 \