aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFeng Xiao <xiaofeng@google.com>2015-10-16 16:57:36 -0700
committerFeng Xiao <xiaofeng@google.com>2015-10-16 16:57:36 -0700
commit70b81ba10db0f58451172f427d974baa94a80018 (patch)
tree8659377b85681ca8aca134984e49723f26e4fe42
parent5314ad1b215c95b46a000794a08139d0a3077d74 (diff)
parenta9e6a8f61d754368643571f73dd2c0b94baf88c1 (diff)
downloadprotobuf-70b81ba10db0f58451172f427d974baa94a80018.tar.gz
protobuf-70b81ba10db0f58451172f427d974baa94a80018.tar.bz2
protobuf-70b81ba10db0f58451172f427d974baa94a80018.zip
Merge pull request #889 from leif81/patch-1
Fix typos in cmake README.md
-rw-r--r--cmake/README.md20
1 files changed, 10 insertions, 10 deletions
diff --git a/cmake/README.md b/cmake/README.md
index 4cd049e6..b3042e6c 100644
--- a/cmake/README.md
+++ b/cmake/README.md
@@ -28,11 +28,11 @@ Create a folder where protobuf headers/libraries/binaries will be installed afte
C:\Path\to>mkdir install
-If *cmake* coomand is not avaliable from *Command Promt*, add it to system *PATH* variable:
+If *cmake* command is not avaliable from *Command Prompt*, add it to system *PATH* variable:
C:\Path\to>set PATH=%PATH%;C:\Program Files (x86)\CMake\bin
-If *git* coomand is not avaliable from *Command Promt*, add it to system *PATH* variable:
+If *git* command is not avaliable from *Command Prompt*, add it to system *PATH* variable:
C:\Path\to>set PATH=%PATH%;C:\Program Files\Git\cmd
@@ -64,7 +64,7 @@ You can download gmock as follows:
C:\Path\to\protobuf>git clone -b release-1.7.0 https://github.com/google/googlemock.git gmock
-Then go to *gmock* folder and downdload gtest:
+Then go to *gmock* folder and download gtest:
C:\Path\to\protobuf>cd gmock
C:\Path\to\protobuf\gmock>git clone -b release-1.7.0 https://github.com/google/googletest.git gtest
@@ -123,12 +123,12 @@ It will generate *nmake* *Makefile* in current directory.
To create *Visual Studio* solution file:
- C:\Path\to\protobuf\cmake>mkdir solution & cd solution
- C:\Path\to\protobuf\cmake\solution>cmake -G "Visual Studio 12 2013 Win64" ^
+ C:\Path\to\protobuf\cmake\build>mkdir solution & cd solution
+ C:\Path\to\protobuf\cmake\build\solution>cmake -G "Visual Studio 12 2013 Win64" ^
-DCMAKE_INSTALL_PREFIX=../../../../install ^
../..
-It will generate *Visual Studion* solution file *protobuf.sln* in current directory.
+It will generate *Visual Studio* solution file *protobuf.sln* in current directory.
If the *gmock* directory does not exist, and you do not want to build protobuf unit tests,
you need to add *cmake* command argument `-Dprotobuf_BUILD_TESTS=OFF` to disable testing.
@@ -146,13 +146,13 @@ or
And wait for the compilation to finish.
-You prefer to use the IDE:
+If you prefer to use the IDE:
* Open the generated protobuf.sln file in Microsoft Visual Studio.
* Choose "Debug" or "Release" configuration as desired.
* From the Build menu, choose "Build Solution".
-wait for the compilation to finish.
+And wait for the compilation to finish.
Testing
=======
@@ -163,7 +163,7 @@ To run unit-tests:
or
- C:\Path\to\protobuf\cmake\build\debug>nmake check
+ C:\Path\to\protobuf\cmake\build\debug>nmake check
You can also build project *check* from Visual Studio solution.
Yes, it may sound strange, but it works.
@@ -211,7 +211,7 @@ To install protobuf to the specified *install* folder:
or
- C:\Path\to\protobuf\cmake\build\debug>nmake install
+ C:\Path\to\protobuf\cmake\build\debug>nmake install
You can also build project *INSTALL* from Visual Studio solution.
It sounds not so strange and it works.