From 10ff7f9468634ecc5a6ff8b8e5888d5d5068daeb Mon Sep 17 00:00:00 2001 From: Samuel Roth Date: Mon, 12 Sep 2016 12:14:00 -0400 Subject: Fixing relative links --- googlemock/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'googlemock/README.md') diff --git a/googlemock/README.md b/googlemock/README.md index 332beab3..629b8678 100644 --- a/googlemock/README.md +++ b/googlemock/README.md @@ -53,7 +53,7 @@ the Apache License, which is different from Google Mock's license. If you are new to the project, we suggest that you read the user documentation in the following order: - * Learn the [basics](../googletest/docs/Primer.md) of + * Learn the [basics](../../../googletest/docs/Primer.md) of Google Test, if you choose to use Google Mock with it (recommended). * Read [Google Mock for Dummies](docs/ForDummies.md). * Read the instructions below on how to build Google Mock. -- cgit v1.2.3 From 16d6af7d414a5d7a7e6c3d1cfbdaf4b45bdad193 Mon Sep 17 00:00:00 2001 From: Samuel Roth Date: Mon, 12 Sep 2016 12:14:53 -0400 Subject: Relative links --- googlemock/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'googlemock/README.md') diff --git a/googlemock/README.md b/googlemock/README.md index 629b8678..ae7e4846 100644 --- a/googlemock/README.md +++ b/googlemock/README.md @@ -53,7 +53,7 @@ the Apache License, which is different from Google Mock's license. If you are new to the project, we suggest that you read the user documentation in the following order: - * Learn the [basics](../../../googletest/docs/Primer.md) of + * Learn the [basics](../../googletest/docs/Primer.md) of Google Test, if you choose to use Google Mock with it (recommended). * Read [Google Mock for Dummies](docs/ForDummies.md). * Read the instructions below on how to build Google Mock. -- cgit v1.2.3 From 51b290d41e5d5407f7155e903d1ff559129f7d40 Mon Sep 17 00:00:00 2001 From: Samuel Roth Date: Mon, 12 Sep 2016 12:15:49 -0400 Subject: One works --- googlemock/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'googlemock/README.md') diff --git a/googlemock/README.md b/googlemock/README.md index ae7e4846..261af22d 100644 --- a/googlemock/README.md +++ b/googlemock/README.md @@ -53,7 +53,7 @@ the Apache License, which is different from Google Mock's license. If you are new to the project, we suggest that you read the user documentation in the following order: - * Learn the [basics](../../googletest/docs/Primer.md) of + * Learn the [basics](../../tree/master/googletest/docs/Primer.md) of Google Test, if you choose to use Google Mock with it (recommended). * Read [Google Mock for Dummies](docs/ForDummies.md). * Read the instructions below on how to build Google Mock. -- cgit v1.2.3 From 9cb03aa702235e3665d3555214eeb45082ac678e Mon Sep 17 00:00:00 2001 From: Samuel Roth Date: Mon, 12 Sep 2016 12:19:26 -0400 Subject: Fixing ForDummies link --- googlemock/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'googlemock/README.md') diff --git a/googlemock/README.md b/googlemock/README.md index 261af22d..8318f871 100644 --- a/googlemock/README.md +++ b/googlemock/README.md @@ -55,7 +55,7 @@ documentation in the following order: * Learn the [basics](../../tree/master/googletest/docs/Primer.md) of Google Test, if you choose to use Google Mock with it (recommended). - * Read [Google Mock for Dummies](docs/ForDummies.md). + * Read [Google Mock for Dummies](../../tree/master/googlemock/docs/ForDummies.md). * Read the instructions below on how to build Google Mock. You can also watch Zhanyong's [talk](http://www.youtube.com/watch?v=sYpCyLI47rM) on Google Mock's usage and implementation. -- cgit v1.2.3 From f5c0130e88a373ed4a53c96c2676ebe53a3b883c Mon Sep 17 00:00:00 2001 From: Samuel Roth Date: Mon, 12 Sep 2016 12:24:08 -0400 Subject: Broken relative links fixed --- googlemock/README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'googlemock/README.md') diff --git a/googlemock/README.md b/googlemock/README.md index 8318f871..a02fd225 100644 --- a/googlemock/README.md +++ b/googlemock/README.md @@ -62,14 +62,14 @@ You can also watch Zhanyong's [talk](http://www.youtube.com/watch?v=sYpCyLI47rM) Once you understand the basics, check out the rest of the docs: - * [CheatSheet](docs/CheatSheet.md) - all the commonly used stuff + * [CheatSheet](../../tree/master/googlemock/docs/CheatSheet.md) - all the commonly used stuff at a glance. - * [CookBook](docs/CookBook.md) - recipes for getting things done, + * [CookBook](../../tree/master/googlemock/docs/CookBook.md) - recipes for getting things done, including advanced techniques. If you need help, please check the -[KnownIssues](docs/KnownIssues.md) and -[FrequentlyAskedQuestions](docs/FrequentlyAskedQuestions.md) before +[KnownIssues](../../tree/master/googlemock/docs/KnownIssues.md) and +[FrequentlyAskedQuestions](../../tree/master/googlemock/docs/FrequentlyAskedQuestions.md) before posting a question on the [discussion group](http://groups.google.com/group/googlemock). @@ -79,7 +79,7 @@ posting a question on the Google Mock is not a testing framework itself. Instead, it needs a testing framework for writing tests. Google Mock works seamlessly with [Google Test](http://code.google.com/p/googletest/), but -you can also use it with [any C++ testing framework](googlemock/ForDummies.md#Using_Google_Mock_with_Any_Testing_Framework). +you can also use it with [any C++ testing framework](../../tree/master/googlemock/docs/ForDummies.md#Using_Google_Mock_with_Any_Testing_Framework). ### Requirements for End Users ### @@ -90,7 +90,7 @@ You must use the bundled version of Google Test when using Google Mock. You can also easily configure Google Mock to work with another testing framework, although it will still need Google Test. Please read ["Using_Google_Mock_with_Any_Testing_Framework"]( - docs/ForDummies.md#Using_Google_Mock_with_Any_Testing_Framework) + ../../tree/master/googlemock/docs/ForDummies.md#Using_Google_Mock_with_Any_Testing_Framework) for instructions. Google Mock depends on advanced C++ features and thus requires a more -- cgit v1.2.3 From 995db996dee6d6a8b537fd0174a940545442b137 Mon Sep 17 00:00:00 2001 From: Samuel Roth Date: Mon, 12 Sep 2016 12:27:36 -0400 Subject: Fixing KnownIssues and FrequentlyAskedQuestions links --- googlemock/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'googlemock/README.md') diff --git a/googlemock/README.md b/googlemock/README.md index a02fd225..2d6184da 100644 --- a/googlemock/README.md +++ b/googlemock/README.md @@ -68,8 +68,8 @@ Once you understand the basics, check out the rest of the docs: including advanced techniques. If you need help, please check the -[KnownIssues](../../tree/master/googlemock/docs/KnownIssues.md) and -[FrequentlyAskedQuestions](../../tree/master/googlemock/docs/FrequentlyAskedQuestions.md) before +[KnownIssues](docs/KnownIssues.md) and +[FrequentlyAskedQuestions](docs/FrequentlyAskedQuestions.md) before posting a question on the [discussion group](http://groups.google.com/group/googlemock). -- cgit v1.2.3 From 960a511f45beb0d8d2e40c439684e11f15c96d63 Mon Sep 17 00:00:00 2001 From: Samuel Roth Date: Mon, 12 Sep 2016 12:31:50 -0400 Subject: Fixing relative links --- googlemock/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'googlemock/README.md') diff --git a/googlemock/README.md b/googlemock/README.md index 2d6184da..c6ef70ab 100644 --- a/googlemock/README.md +++ b/googlemock/README.md @@ -79,7 +79,7 @@ posting a question on the Google Mock is not a testing framework itself. Instead, it needs a testing framework for writing tests. Google Mock works seamlessly with [Google Test](http://code.google.com/p/googletest/), but -you can also use it with [any C++ testing framework](../../tree/master/googlemock/docs/ForDummies.md#Using_Google_Mock_with_Any_Testing_Framework). +you can also use it with [any C++ testing framework](../../tree/master/googlemock/docs/ForDummies.md#using-google-mock-with-any-testing-framework). ### Requirements for End Users ### @@ -90,7 +90,7 @@ You must use the bundled version of Google Test when using Google Mock. You can also easily configure Google Mock to work with another testing framework, although it will still need Google Test. Please read ["Using_Google_Mock_with_Any_Testing_Framework"]( - ../../tree/master/googlemock/docs/ForDummies.md#Using_Google_Mock_with_Any_Testing_Framework) + ../../tree/master/googlemock/docs/ForDummies.md#using-google-mock-with-any-testing-framework) for instructions. Google Mock depends on advanced C++ features and thus requires a more -- cgit v1.2.3 From 0e0ff5c3410f88e09701fef04dcfcaad9cd3494f Mon Sep 17 00:00:00 2001 From: Samuel Roth Date: Mon, 12 Sep 2016 12:33:44 -0400 Subject: blob vs tree --- googlemock/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'googlemock/README.md') diff --git a/googlemock/README.md b/googlemock/README.md index c6ef70ab..ba8842dc 100644 --- a/googlemock/README.md +++ b/googlemock/README.md @@ -79,7 +79,7 @@ posting a question on the Google Mock is not a testing framework itself. Instead, it needs a testing framework for writing tests. Google Mock works seamlessly with [Google Test](http://code.google.com/p/googletest/), but -you can also use it with [any C++ testing framework](../../tree/master/googlemock/docs/ForDummies.md#using-google-mock-with-any-testing-framework). +you can also use it with [any C++ testing framework](../../master/googlemock/docs/ForDummies.md#using-google-mock-with-any-testing-framework). ### Requirements for End Users ### -- cgit v1.2.3 From 32b4a9b39079ca4bf4ff539246302652d86e777f Mon Sep 17 00:00:00 2001 From: Samuel Roth Date: Mon, 12 Sep 2016 12:34:50 -0400 Subject: Fixed broken links --- googlemock/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'googlemock/README.md') diff --git a/googlemock/README.md b/googlemock/README.md index ba8842dc..191df69f 100644 --- a/googlemock/README.md +++ b/googlemock/README.md @@ -90,7 +90,7 @@ You must use the bundled version of Google Test when using Google Mock. You can also easily configure Google Mock to work with another testing framework, although it will still need Google Test. Please read ["Using_Google_Mock_with_Any_Testing_Framework"]( - ../../tree/master/googlemock/docs/ForDummies.md#using-google-mock-with-any-testing-framework) + ../../master/googlemock/docs/ForDummies.md#using-google-mock-with-any-testing-framework) for instructions. Google Mock depends on advanced C++ features and thus requires a more -- cgit v1.2.3 From cb502b7ad15c9dc9d1f74087a9fc7b6d12177b9b Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Tue, 8 Dec 2015 00:14:24 +1100 Subject: Added CMake configure-time download instructions to docs Adds instructions for how to add gtest and gmock to another CMake project directly. Downloading of the googletest sources happens as configure time, allowing it to be added to the main build directly via the add_subdirectory() command. This ensures googletest is built with the same compiler settings, etc. and will typically result in a more robust and more convenient build arrangement. --- googlemock/README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'googlemock/README.md') diff --git a/googlemock/README.md b/googlemock/README.md index 332beab3..ed500c8a 100644 --- a/googlemock/README.md +++ b/googlemock/README.md @@ -125,6 +125,14 @@ build Google Mock and its tests, which has further requirements: ### Building Google Mock ### +If you have CMake available, it is recommended that you follow the +[build instructions][gtest_cmakebuild] +as described for Google Test. If are using Google Mock with an +existing CMake project, the section +[Incorporating Into An Existing CMake Project][gtest_incorpcmake] +may be of particular interest. Otherwise, the following sections +detail how to build Google Mock without CMake. + #### Preparing to Build (Unix only) #### If you are using a Unix system and plan to use the GNU Autotools build @@ -331,3 +339,5 @@ patch. Happy testing! [gtest_readme]: ../googletest/README.md "googletest" +[gtest_cmakebuild]: ../googletest/README.md#using-cmake "Using CMake" +[gtest_incorpcmake]: ../googletest/README.md#incorporating-into-an-existing-cmake-project "Incorporating Into An Existing CMake Project" -- cgit v1.2.3 From ba638689e40fc60c2e5194fc777bf30541deeff8 Mon Sep 17 00:00:00 2001 From: Billy Donahue Date: Sat, 25 Feb 2017 20:46:21 -0500 Subject: Remove /tree/ from Readme.md links. Issue #1028 --- googlemock/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'googlemock/README.md') diff --git a/googlemock/README.md b/googlemock/README.md index 3eb10cbb..7b13a6d3 100644 --- a/googlemock/README.md +++ b/googlemock/README.md @@ -53,18 +53,18 @@ the Apache License, which is different from Google Mock's license. If you are new to the project, we suggest that you read the user documentation in the following order: - * Learn the [basics](../../tree/master/googletest/docs/Primer.md) of + * Learn the [basics](../../master/googletest/docs/Primer.md) of Google Test, if you choose to use Google Mock with it (recommended). - * Read [Google Mock for Dummies](../../tree/master/googlemock/docs/ForDummies.md). + * Read [Google Mock for Dummies](../../master/googlemock/docs/ForDummies.md). * Read the instructions below on how to build Google Mock. You can also watch Zhanyong's [talk](http://www.youtube.com/watch?v=sYpCyLI47rM) on Google Mock's usage and implementation. Once you understand the basics, check out the rest of the docs: - * [CheatSheet](../../tree/master/googlemock/docs/CheatSheet.md) - all the commonly used stuff + * [CheatSheet](../../master/googlemock/docs/CheatSheet.md) - all the commonly used stuff at a glance. - * [CookBook](../../tree/master/googlemock/docs/CookBook.md) - recipes for getting things done, + * [CookBook](../../master/googlemock/docs/CookBook.md) - recipes for getting things done, including advanced techniques. If you need help, please check the -- cgit v1.2.3