Merge branch 'master' into fix-gmock-pkgconfig

googlemock/docs/DesignDoc.md

@@ -11,7 +11,7 @@ non-trivial effort to define a custom action in Google Mock.  For
 example, suppose you want to "increment the value pointed to by the
 second argument of the mock function and return it", you could write:
 
-```
+```cpp
 int IncrementArg1(Unused, int* p, Unused) {
   return ++(*p);
 }
@@ -28,7 +28,7 @@ There are several things unsatisfactory about this approach:
 The latter two problems can be overcome using `MakePolymorphicAction()`,
 but it requires much more boilerplate code:
 
-```
+```cpp
 class IncrementArg1Action {
  public:
   template <typename Result, typename ArgumentTuple>
@@ -50,7 +50,7 @@ boiler-plate C++ requires.
 ## Solution ##
 
 We propose to introduce a new macro:
-```
+```cpp
 ACTION(name) { statements; }
 ```
 
@@ -58,11 +58,11 @@ Using this in a namespace scope will define an action with the given
 name that executes the statements.  Inside the statements, you can
 refer to the K-th (0-based) argument of the mock function as `argK`.
 For example:
-```
+```cpp
 ACTION(IncrementArg1) { return ++(*arg1); }
 ```
 allows you to write
-```
+```cpp
 ... WillOnce(IncrementArg1());
 ```
 
@@ -73,7 +73,7 @@ your code is still type-safe though: you'll get a compiler error if
 `++(*arg1)` isn't compatible with the mock function's return type.
 
 Another example:
-```
+```cpp
 ACTION(Foo) {
   (*arg2)(5);
   Blah();
@@ -88,18 +88,20 @@ with 5, calls function `Blah()`, sets the value pointed to by argument
 For more convenience and flexibility, you can also use the following
 pre-defined symbols in the body of `ACTION`:
 
-| `argK_type` | The type of the K-th (0-based) argument of the mock function |
-|:------------|:-------------------------------------------------------------|
-| `args`      | All arguments of the mock function as a tuple                |
-| `args_type` | The type of all arguments of the mock function as a tuple    |
-| `return_type` | The return type of the mock function                         |
+| Argument        | Description                                                  |
+|:----------------|:-------------------------------------------------------------|
+| `argK_type`     | The type of the K-th (0-based) argument of the mock function |
+| `args`          | All arguments of the mock function as a tuple                |
+| `args_type`     | The type of all arguments of the mock function as a tuple    |
+| `return_type`   | The return type of the mock function                         |
 | `function_type` | The type of the mock function                                |
 
 For example, when using an `ACTION` as a stub action for mock function:
-```
+```cpp
 int DoSomething(bool flag, int* ptr);
 ```
 we have:
+
 | **Pre-defined Symbol** | **Is Bound To** |
 |:-----------------------|:----------------|
 | `arg0`                 | the value of `flag` |
@@ -115,16 +117,16 @@ we have:
 
 Sometimes you'll want to parameterize the action.   For that we propose
 another macro
-```
+```cpp
 ACTION_P(name, param) { statements; }
 ```
 
 For example,
-```
+```cpp
 ACTION_P(Add, n) { return arg0 + n; }
 ```
 will allow you to write
-```
+```cpp
 // Returns argument #0 + 5.
 ... WillOnce(Add(5));
 ```
@@ -140,7 +142,7 @@ parameter as inferred by the compiler.
 
 We will also provide `ACTION_P2`, `ACTION_P3`, and etc to support
 multi-parameter actions.  For example,
-```
+```cpp
 ACTION_P2(ReturnDistanceTo, x, y) {
   double dx = arg0 - x;
   double dy = arg1 - y;
@@ -148,7 +150,7 @@ ACTION_P2(ReturnDistanceTo, x, y) {
 }
 ```
 lets you write
-```
+```cpp
 ... WillOnce(ReturnDistanceTo(5.0, 26.5));
 ```
 
@@ -160,7 +162,7 @@ number of parameters is 0.
 ### Overloading Actions ###
 
 You can easily define actions overloaded on the number of parameters:
-```
+```cpp
 ACTION_P(Plus, a) { ... }
 ACTION_P2(Plus, a, b) { ... }
 ```
@@ -173,7 +175,7 @@ parameters.  Instead, we let the compiler infer the types for us.
 
 Sometimes, however, we may want to be more explicit about the types.
 There are several tricks to do that.  For example:
-```
+```cpp
 ACTION(Foo) {
   // Makes sure arg0 can be converted to int.
   int n = arg0;
@@ -196,12 +198,12 @@ Google Test (the name is chosen to match `static_assert` in C++0x).
 If you are writing a function that returns an `ACTION` object, you'll
 need to know its type.  The type depends on the macro used to define
 the action and the parameter types.  The rule is relatively simple:
-| **Given Definition** | **Expression** | **Has Type** |
-|:---------------------|:---------------|:-------------|
-| `ACTION(Foo)`        | `Foo()`        | `FooAction`  |
-| `ACTION_P(Bar, param)` | `Bar(int_value)` | `BarActionP<int>` |
+| **Given Definition**     | **Expression**               | **Has Type**             |
+|:-------------------------|:-----------------------------|:-------------------------|
+| `ACTION(Foo)`            | `Foo()`                      | `FooAction`              |
+| `ACTION_P(Bar, param)`   | `Bar(int_value)`             | `BarActionP<int>`        |
 | `ACTION_P2(Baz, p1, p2)` | `Baz(bool_value, int_value)` | `BazActionP2<bool, int>` |
-| ...                  | ...            | ...          |
+| ...                      | ...                          | ...                      |
 
 Note that we have to pick different suffixes (`Action`, `ActionP`,
 `ActionP2`, and etc) for actions with different numbers of parameters,
@@ -262,14 +264,14 @@ available, we may want to support using lambdas as actions.
 Once the macros for defining actions are implemented, we plan to do
 the same for matchers:
 
-```
+```cpp
 MATCHER(name) { statements; }
 ```
 
 where you can refer to the value being matched as `arg`.  For example,
 given:
 
-```
+```cpp
 MATCHER(IsPositive) { return arg > 0; }
 ```
 
@@ -277,4 +279,4 @@ you can use `IsPositive()` as a matcher that matches a value iff it is
 greater than 0.
 
 We will also add `MATCHER_P`, `MATCHER_P2`, and etc for parameterized
-matchers.
+matchers.
\ No newline at end of file

googlemock/docs/ForDummies.md

@@ -49,7 +49,7 @@ Using Google Mock is easy! Inside your C++ source file, just `#include` `"gtest/
 # A Case for Mock Turtles #
 Let's look at an example. Suppose you are developing a graphics program that relies on a LOGO-like API for drawing. How would you test that it does the right thing? Well, you can run it and compare the screen with a golden screen snapshot, but let's admit it: tests like this are expensive to run and fragile (What if you just upgraded to a shiny new graphics card that has better anti-aliasing? Suddenly you have to update all your golden images.). It would be too painful if all your tests are like this. Fortunately, you learned about Dependency Injection and know the right thing to do: instead of having your application talk to the drawing API directly, wrap the API in an interface (say, `Turtle`) and code to that interface:
 
-```
+```cpp
 class Turtle {
   ...
   virtual ~Turtle() {}
@@ -83,7 +83,7 @@ Using the `Turtle` interface as example, here are the simple steps you need to f
 
 After the process, you should have something like:
 
-```
+```cpp
 #include "gmock/gmock.h"  // Brings in Google Mock.
 class MockTurtle : public Turtle {
  public:
@@ -125,7 +125,7 @@ Once you have a mock class, using it is easy. The typical work flow is:
 
 Here's an example:
 
-```
+```cpp
 #include "path/to/mock-turtle.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
@@ -171,7 +171,7 @@ Admittedly, this test is contrived and doesn't do much. You can easily achieve t
 ## Using Google Mock with Any Testing Framework ##
 If you want to use something other than Google Test (e.g. [CppUnit](http://sourceforge.net/projects/cppunit/) or
 [CxxTest](https://cxxtest.com/)) as your testing framework, just change the `main()` function in the previous section to:
-```
+```cpp
 int main(int argc, char** argv) {
   // The following line causes Google Mock to throw an exception on failure,
   // which will be interpreted by your testing framework as a test failure.
@@ -203,7 +203,7 @@ The key to using a mock object successfully is to set the _right expectations_ o
 ## General Syntax ##
 In Google Mock we use the `EXPECT_CALL()` macro to set an expectation on a mock method. The general syntax is:
 
-```
+```cpp
 EXPECT_CALL(mock_object, method(matchers))
     .Times(cardinality)
     .WillOnce(action)
@@ -216,7 +216,7 @@ The macro can be followed by some optional _clauses_ that provide more informati
 
 This syntax is designed to make an expectation read like English. For example, you can probably guess that
 
-```
+```cpp
 using ::testing::Return;
 ...
 EXPECT_CALL(turtle, GetX())
@@ -233,14 +233,14 @@ says that the `turtle` object's `GetX()` method will be called five times, it wi
 ## Matchers: What Arguments Do We Expect? ##
 When a mock function takes arguments, we must specify what arguments we are expecting; for example:
 
-```
+```cpp
 // Expects the turtle to move forward by 100 units.
 EXPECT_CALL(turtle, Forward(100));
 ```
 
 Sometimes you may not want to be too specific (Remember that talk about tests being too rigid? Over specification leads to brittle tests and obscures the intent of tests. Therefore we encourage you to specify only what's necessary - no more, no less.). If you care to check that `Forward()` will be called but aren't interested in its actual argument, write `_` as the argument, which means "anything goes":
 
-```
+```cpp
 using ::testing::_;
 ...
 // Expects the turtle to move forward.
@@ -251,7 +251,7 @@ EXPECT_CALL(turtle, Forward(_));
 
 A list of built-in matchers can be found in the [CheatSheet](CheatSheet.md). For example, here's the `Ge` (greater than or equal) matcher:
 
-```
+```cpp
 using ::testing::Ge;
 ...
 EXPECT_CALL(turtle, Forward(Ge(100)));
@@ -281,7 +281,7 @@ First, if the return type of a mock function is a built-in type or a pointer, th
 
 Second, if a mock function doesn't have a default action, or the default action doesn't suit you, you can specify the action to be taken each time the expectation matches using a series of `WillOnce()` clauses followed by an optional `WillRepeatedly()`. For example,
 
-```
+```cpp
 using ::testing::Return;
 ...
 EXPECT_CALL(turtle, GetX())
@@ -292,7 +292,7 @@ EXPECT_CALL(turtle, GetX())
 
 This says that `turtle.GetX()` will be called _exactly three times_ (Google Mock inferred this from how many `WillOnce()` clauses we've written, since we didn't explicitly write `Times()`), and will return 100, 200, and 300 respectively.
 
-```
+```cpp
 using ::testing::Return;
 ...
 EXPECT_CALL(turtle, GetY())
@@ -309,7 +309,7 @@ What can we do inside `WillOnce()` besides `Return()`? You can return a referenc
 
 **Important note:** The `EXPECT_CALL()` statement evaluates the action clause only once, even though the action may be performed many times. Therefore you must be careful about side effects. The following may not do what you want:
 
-```
+```cpp
 int n = 100;
 EXPECT_CALL(turtle, GetX())
 .Times(4)
@@ -320,7 +320,7 @@ Instead of returning 100, 101, 102, ..., consecutively, this mock function will
 
 Time for another quiz! What do you think the following means?
 
-```
+```cpp
 using ::testing::Return;
 ...
 EXPECT_CALL(turtle, GetY())
@@ -335,7 +335,7 @@ So far we've only shown examples where you have a single expectation. More reali
 
 By default, when a mock method is invoked, Google Mock will search the expectations in the **reverse order** they are defined, and stop when an active expectation that matches the arguments is found (you can think of it as "newer rules override older ones."). If the matching expectation cannot take any more calls, you will get an upper-bound-violated failure. Here's an example:
 
-```
+```cpp
 using ::testing::_;
 ...
 EXPECT_CALL(turtle, Forward(_));  // #1
@@ -352,7 +352,7 @@ By default, an expectation can match a call even though an earlier expectation h
 
 Sometimes, you may want all the expected calls to occur in a strict order. To say this in Google Mock is easy:
 
-```
+```cpp
 using ::testing::InSequence;
 ...
 TEST(FooTest, DrawsLineSegment) {
@@ -379,7 +379,7 @@ Now let's do a quick quiz to see how well you can use this mock stuff already. H
 
 After you've come up with your answer, take a look at ours and compare notes (solve it yourself first - don't cheat!):
 
-```
+```cpp
 using ::testing::_;
 ...
 EXPECT_CALL(turtle, GoTo(_, _))  // #1
@@ -394,7 +394,7 @@ This example shows that **expectations in Google Mock are "sticky" by default**,
 
 Simple? Let's see if you've really understood it: what does the following code say?
 
-```
+```cpp
 using ::testing::Return;
 ...
 for (int i = n; i > 0; i--) {
@@ -407,7 +407,7 @@ If you think it says that `turtle.GetX()` will be called `n` times and will retu
 
 One correct way of saying that `turtle.GetX()` will return 10, 20, 30, ..., is to explicitly say that the expectations are _not_ sticky. In other words, they should _retire_ as soon as they are saturated:
 
-```
+```cpp
 using ::testing::Return;
 ...
 for (int i = n; i > 0; i--) {
@@ -419,7 +419,7 @@ for (int i = n; i > 0; i--) {
 
 And, there's a better way to do it: in this case, we expect the calls to occur in a specific order, and we line up the actions to match the order. Since the order is important here, we should make it explicit using a sequence:
 
-```
+```cpp
 using ::testing::InSequence;
 using ::testing::Return;
 ...

googlemock/docs/FrequentlyAskedQuestions.md

@@ -27,7 +27,7 @@ later.  Fortunately, it's usually not hard to migrate an existing
 matcher to the new API.  Here's what you need to do:
 
 If you wrote your matcher like this:
-```
+```cpp
 // Old matcher definition that doesn't work with the latest
 // Google Mock.
 using ::testing::MatcherInterface;
@@ -44,7 +44,7 @@ class MyWonderfulMatcher : public MatcherInterface<MyType> {
 ```
 
 you'll need to change it to:
-```
+```cpp
 // New matcher definition that works with the latest Google Mock.
 using ::testing::MatcherInterface;
 using ::testing::MatchResultListener;
@@ -65,7 +65,7 @@ argument of type `MatchResultListener*`.)
 
 If you were also using `ExplainMatchResultTo()` to improve the matcher
 message:
-```
+```cpp
 // Old matcher definition that doesn't work with the lastest
 // Google Mock.
 using ::testing::MatcherInterface;
@@ -91,7 +91,7 @@ class MyWonderfulMatcher : public MatcherInterface<MyType> {
 you should move the logic of `ExplainMatchResultTo()` into
 `MatchAndExplain()`, using the `MatchResultListener` argument where
 the `::std::ostream` was used:
-```
+```cpp
 // New matcher definition that works with the latest Google Mock.
 using ::testing::MatcherInterface;
 using ::testing::MatchResultListener;
@@ -110,7 +110,7 @@ class MyWonderfulMatcher : public MatcherInterface<MyType> {
 ```
 
 If your matcher is defined using `MakePolymorphicMatcher()`:
-```
+```cpp
 // Old matcher definition that doesn't work with the latest
 // Google Mock.
 using ::testing::MakePolymorphicMatcher;
@@ -130,7 +130,7 @@ class MyGreatMatcher {
 you should rename the `Matches()` method to `MatchAndExplain()` and
 add a `MatchResultListener*` argument (the same as what you need to do
 for matchers defined by implementing `MatcherInterface`):
-```
+```cpp
 // New matcher definition that works with the latest Google Mock.
 using ::testing::MakePolymorphicMatcher;
 using ::testing::MatchResultListener;
@@ -150,7 +150,7 @@ class MyGreatMatcher {
 
 If your polymorphic matcher uses `ExplainMatchResultTo()` for better
 failure messages:
-```
+```cpp
 // Old matcher definition that doesn't work with the latest
 // Google Mock.
 using ::testing::MakePolymorphicMatcher;
@@ -176,7 +176,7 @@ void ExplainMatchResultTo(const MyGreatMatcher& matcher,
 
 you'll need to move the logic inside `ExplainMatchResultTo()` to
 `MatchAndExplain()`:
-```
+```cpp
 // New matcher definition that works with the latest Google Mock.
 using ::testing::MakePolymorphicMatcher;
 using ::testing::MatchResultListener;
@@ -254,7 +254,7 @@ C++ as much as possible.
 ## MSVC gives me warning C4301 or C4373 when I define a mock method with a const parameter.  Why? ##
 
 If you compile this using Microsoft Visual C++ 2005 SP1:
-```
+```cpp
 class Foo {
   ...
   virtual void Bar(const int i) = 0;
@@ -279,7 +279,7 @@ warning C4373: 'MockFoo::Bar': virtual function overrides 'Foo::Bar', previous v
 In C++, if you _declare_ a function with a `const` parameter, the
 `const` modifier is _ignored_.  Therefore, the `Foo` base class above
 is equivalent to:
-```
+```cpp
 class Foo {
   ...
   virtual void Bar(int i) = 0;  // int or const int?  Makes no difference.
@@ -298,7 +298,7 @@ Note that we are talking about the _top-level_ `const` modifier here.
 If the function parameter is passed by pointer or reference, declaring
 the _pointee_ or _referee_ as `const` is still meaningful.  For
 example, the following two declarations are _not_ equivalent:
-```
+```cpp
 void Bar(int* p);        // Neither p nor *p is const.
 void Bar(const int* p);  // p is not const, but *p is.
 ```
@@ -318,7 +318,7 @@ you'll gain insights on why the expectations you set are not met.
 
 ## How can I assert that a function is NEVER called? ##
 
-```
+```cpp
 EXPECT_CALL(foo, Bar(_))
     .Times(0);
 ```
@@ -345,7 +345,7 @@ Whenever you derive from a base class, make sure its destructor is
 virtual.  Otherwise Bad Things will happen.  Consider the following
 code:
 
-```
+```cpp
 class Base {
  public:
   // Not virtual, but should be.
@@ -375,7 +375,7 @@ will be happy.
 
 When people complain about this, often they are referring to code like:
 
-```
+```cpp
 // foo.Bar() should be called twice, return 1 the first time, and return
 // 2 the second time.  However, I have to write the expectations in the
 // reverse order.  This sucks big time!!!
@@ -399,7 +399,7 @@ harder to do so.
 There are two better ways to write the test spec.  You could either
 put the expectations in sequence:
 
-```
+```cpp
 // foo.Bar() should be called twice, return 1 the first time, and return
 // 2 the second time.  Using a sequence, we can write the expectations
 // in their natural order.
@@ -416,7 +416,7 @@ put the expectations in sequence:
 
 or you can put the sequence of actions in the same expectation:
 
-```
+```cpp
 // foo.Bar() should be called twice, return 1 the first time, and return
 // 2 the second time.
 EXPECT_CALL(foo, Bar())
@@ -450,14 +450,14 @@ may creep in unnoticed.
 
 If, however, you are sure that the calls are OK, you can write
 
-```
+```cpp
 EXPECT_CALL(foo, Bar(_))
     .WillRepeatedly(...);
 ```
 
 instead of
 
-```
+```cpp
 ON_CALL(foo, Bar(_))
     .WillByDefault(...);
 ```
@@ -488,12 +488,12 @@ extent, Google Mock's syntax was chosen for several practical advantages it
 has.
 
 Try to mock a function that takes a map as an argument:
-```
+```cpp
 virtual int GetSize(const map<int, std::string>& m);
 ```
 
 Using the proposed syntax, it would be:
-```
+```cpp
 MOCK_METHOD1(GetSize, int, const map<int, std::string>& m);
 ```
 
@@ -503,7 +503,7 @@ around this you can use `typedef` to give the map type a name, but
 that gets in the way of your work.  Google Mock's syntax avoids this
 problem as the function's argument types are protected inside a pair
 of parentheses:
-```
+```cpp
 // This compiles fine.
 MOCK_METHOD1(GetSize, int(const map<int, std::string>& m));
 ```

googletest/README.md

@@ -115,60 +115,64 @@ pulled into the main build with `add_subdirectory()`. For example:
 
 New file `CMakeLists.txt.in`:
 
-    cmake_minimum_required(VERSION 2.8.2)
-
-    project(googletest-download NONE)
-
-    include(ExternalProject)
-    ExternalProject_Add(googletest
-      GIT_REPOSITORY    https://github.com/google/googletest.git
-      GIT_TAG           master
-      SOURCE_DIR        "${CMAKE_BINARY_DIR}/googletest-src"
-      BINARY_DIR        "${CMAKE_BINARY_DIR}/googletest-build"
-      CONFIGURE_COMMAND ""
-      BUILD_COMMAND     ""
-      INSTALL_COMMAND   ""
-      TEST_COMMAND      ""
-    )
+``` cmake
+cmake_minimum_required(VERSION 2.8.2)
+
+project(googletest-download NONE)
+
+include(ExternalProject)
+ExternalProject_Add(googletest
+  GIT_REPOSITORY    https://github.com/google/googletest.git
+  GIT_TAG           master
+  SOURCE_DIR        "${CMAKE_BINARY_DIR}/googletest-src"
+  BINARY_DIR        "${CMAKE_BINARY_DIR}/googletest-build"
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND     ""
+  INSTALL_COMMAND   ""
+  TEST_COMMAND      ""
+)
+```
 
 Existing build's `CMakeLists.txt`:
 
-    # Download and unpack googletest at configure time
-    configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt)
-    execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
-      RESULT_VARIABLE result
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download )
-    if(result)
-      message(FATAL_ERROR "CMake step for googletest failed: ${result}")
-    endif()
-    execute_process(COMMAND ${CMAKE_COMMAND} --build .
-      RESULT_VARIABLE result
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download )
-    if(result)
-      message(FATAL_ERROR "Build step for googletest failed: ${result}")
-    endif()
-
-    # Prevent overriding the parent project's compiler/linker
-    # settings on Windows
-    set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-
-    # Add googletest directly to our build. This defines
-    # the gtest and gtest_main targets.
-    add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src
-                     ${CMAKE_BINARY_DIR}/googletest-build
-                     EXCLUDE_FROM_ALL)
-
-    # The gtest/gtest_main targets carry header search path
-    # dependencies automatically when using CMake 2.8.11 or
-    # later. Otherwise we have to add them here ourselves.
-    if (CMAKE_VERSION VERSION_LESS 2.8.11)
-      include_directories("${gtest_SOURCE_DIR}/include")
-    endif()
-
-    # Now simply link against gtest or gtest_main as needed. Eg
-    add_executable(example example.cpp)
-    target_link_libraries(example gtest_main)
-    add_test(NAME example_test COMMAND example)
+``` cmake
+# Download and unpack googletest at configure time
+configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt)
+execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
+  RESULT_VARIABLE result
+  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download )
+if(result)
+  message(FATAL_ERROR "CMake step for googletest failed: ${result}")
+endif()
+execute_process(COMMAND ${CMAKE_COMMAND} --build .
+  RESULT_VARIABLE result
+  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download )
+if(result)
+  message(FATAL_ERROR "Build step for googletest failed: ${result}")
+endif()
+
+# Prevent overriding the parent project's compiler/linker
+# settings on Windows
+set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+
+# Add googletest directly to our build. This defines
+# the gtest and gtest_main targets.
+add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src
+                 ${CMAKE_BINARY_DIR}/googletest-build
+                 EXCLUDE_FROM_ALL)
+
+# The gtest/gtest_main targets carry header search path
+# dependencies automatically when using CMake 2.8.11 or
+# later. Otherwise we have to add them here ourselves.
+if (CMAKE_VERSION VERSION_LESS 2.8.11)
+  include_directories("${gtest_SOURCE_DIR}/include")
+endif()
+
+# Now simply link against gtest or gtest_main as needed. Eg
+add_executable(example example.cpp)
+target_link_libraries(example gtest_main)
+add_test(NAME example_test COMMAND example)
+```
 
 Note that this approach requires CMake 2.8.2 or later due to its use of the
 `ExternalProject_Add()` command. The above technique is discussed in more detail

googletest/docs/Pkgconfig.md

@@ -19,7 +19,7 @@ all examples here we assume you want to compile the sample
 
 Using `pkg-config` in CMake is fairly easy:
 
-```
+``` cmake
 cmake_minimum_required(VERSION 3.0)
 
 cmake_policy(SET CMP0048 NEW)
@@ -102,7 +102,7 @@ test('first_and_only_test', testapp)
 Since `pkg-config` is a small Unix command-line utility, it can be used
 in handwritten `Makefile`s too:
 
-```
+``` Makefile
 GTEST_CFLAGS = `pkg-config --cflags gtest_main`
 GTEST_LIBS = `pkg-config --libs gtest_main`
 

googletest/docs/PumpManual.md

@@ -71,7 +71,7 @@ $if i == 0 [[
 
 will be translated by the Pump compiler to:
 
-```
+``` cpp
 // Foo0 does blah for 0-ary predicates.
 template <size_t N>
 class Foo0 {
@@ -107,7 +107,7 @@ $$ The text between i and [[ is the separator between iterations.
 
 will generate one of the following lines (without the comments), depending on the value of `n`:
 
-```
+``` cpp
 Func();              // If n is 0.
 Func(a1);            // If n is 1.
 Func(a1 + a2);       // If n is 2.
@@ -140,7 +140,7 @@ up in your output.
 
 ## Grammar ##
 
-```
+``` ebnf
 code ::= atomic_code*
 atomic_code ::= $var id = exp
     | $var id = [[ code ]]

googletest/docs/primer.md

@@ -471,7 +471,7 @@ If a fatal failure happens the subsequent steps will be skipped.
 >
 > Also, you should call `RUN_ALL_TESTS()` only **once**. Calling it more than
 > once conflicts with some advanced googletest features (e.g. thread-safe [death
-> tests](advanced#death-tests)) and thus is not supported.
+> tests](advanced.md#death-tests)) and thus is not supported.
 
 **Availability**: Linux, Windows, Mac.