aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2013-03-01 21:28:40 +0000
committerzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2013-03-01 21:28:40 +0000
commita1a98f840e25692ddcb0ca872aaf8362a2b4e088 (patch)
tree7d8c9bcd4eec98081d5f6158a2aad499051987b0 /CMakeLists.txt
parentc896504e4175f08cd229ea151861558ba9380f50 (diff)
downloadgoogletest-a1a98f840e25692ddcb0ca872aaf8362a2b4e088.tar.gz
googletest-a1a98f840e25692ddcb0ca872aaf8362a2b4e088.tar.bz2
googletest-a1a98f840e25692ddcb0ca872aaf8362a2b4e088.zip
Adds a cmake target for gmock_ex_test; also fixes name shadowing warnings.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ded9ca9d..572d0444 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -103,6 +103,7 @@ if (gmock_build_tests)
cxx_test(gmock-actions_test gmock_main)
cxx_test(gmock-cardinalities_test gmock_main)
+ cxx_test(gmock_ex_test gmock_main)
cxx_test(gmock-generated-actions_test gmock_main)
cxx_test(gmock-generated-function-mockers_test gmock_main)
cxx_test(gmock-generated-internal-utils_test gmock_main)