aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2018-03-29 12:11:50 -0700
committerFeng Xiao <xfxyjwf@gmail.com>2018-03-29 13:14:00 -0700
commit014e76e2cd61849fb59ffe82fa85001671dd4313 (patch)
treeb1e7f1c038c4d78c5b1ba0a5bf2156be9fb1db49 /cmake
parent7bf47a6b5d10382a4b427677cf7ca9288f4e2833 (diff)
downloadprotobuf-014e76e2cd61849fb59ffe82fa85001671dd4313.tar.gz
protobuf-014e76e2cd61849fb59ffe82fa85001671dd4313.tar.bz2
protobuf-014e76e2cd61849fb59ffe82fa85001671dd4313.zip
Update instructions about getting protobuf source.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/README.md20
1 files changed, 14 insertions, 6 deletions
diff --git a/cmake/README.md b/cmake/README.md
index de14b012..26a516c7 100644
--- a/cmake/README.md
+++ b/cmake/README.md
@@ -41,9 +41,16 @@ Good. Now you are ready to continue.
Getting Sources
===============
-You can get the latest stable source packages from the
-[releases](https://github.com/google/protobuf/releases) page.
-Or you can type:
+You can get the latest stable source packages from the release page:
+
+ https://github.com/google/protobuf/releases/latest
+
+For example: if you only need C++, download `protobuf-cpp-[VERSION].tar.gz`; if
+you need C++ and Java, download `protobuf-java-[VERSION].tar.gz` (every package
+contains C++ source already); if you need C++ and multiple other languages,
+download `protobuf-all-[VERSION].tar.gz`.
+
+Or you can use git to clone from protobuf git repository.
C:\Path\to> git clone -b [release_tag] https://github.com/google/protobuf.git
@@ -55,7 +62,8 @@ Go to the project folder:
C:\Path\to>cd protobuf
C:\Path\to\protobuf>
-Remember to update any submodules:
+Remember to update any submodules if you are using git clone (you can skip this
+step if you are using a release .tar.gz or .zip package):
```console
C:\Path\to> git submodule update --init --recursive
@@ -63,7 +71,7 @@ C:\Path\to> git submodule update --init --recursive
Now go to *cmake* folder in protobuf sources:
- C:\Path\to\protobuf\gmock>cd ..\cmake
+ C:\Path\to\protobuf>cd cmake
C:\Path\to\protobuf\cmake>
Good. Now you are ready to *CMake* configuration.
@@ -113,7 +121,7 @@ It will generate *nmake* *Makefile* in current directory.
To create *Visual Studio* solution file:
C:\Path\to\protobuf\cmake\build>mkdir solution & cd solution
- C:\Path\to\protobuf\cmake\build\solution>cmake -G "Visual Studio 12 2013 Win64" ^
+ C:\Path\to\protobuf\cmake\build\solution>cmake -G "Visual Studio 14 2015 Win64" ^
-DCMAKE_INSTALL_PREFIX=../../../../install ^
../..