diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2015-07-15 20:33:59 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-07-15 20:33:59 -0700 |
| commit | 11002e70c607255cf91fea0f998fe945ca6ddc5e (patch) | |
| tree | eadc17fc1043b12cccdd5868e775bc540faa9841 /cmake | |
| parent | 385baaa87c52abf5339b0be7dccf8a4131667117 (diff) | |
| parent | fde6e89f99eda04a4f1b8677bcea07e6c2040405 (diff) | |
Merge remote-tracking branch 'upstream/master' into csharp-experimental
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/README.md | 2 | ||||
| -rw-r--r-- | cmake/extract_includes.bat.in | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/cmake/README.md b/cmake/README.md index 0abe078e..c68defd8 100644 --- a/cmake/README.md +++ b/cmake/README.md @@ -32,7 +32,7 @@ Compiling and Installing If you don't have gmock, skip the build of tests by turning off the BUILD_TESTING option: - $ cmake -G "Visutal Studio 9 2008" -DBUILD_TESTING=OFF .. + $ cmake -G "Visual Studio 9 2008" -DBUILD_TESTING=OFF .. 3. Open the generated protobuf.sln file in Microsoft Visual Studio. 4. Choose "Debug" or "Release" configuration as desired. diff --git a/cmake/extract_includes.bat.in b/cmake/extract_includes.bat.in index 4e34d81a..6b84c378 100644 --- a/cmake/extract_includes.bat.in +++ b/cmake/extract_includes.bat.in @@ -89,7 +89,6 @@ copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\common.h include copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\fastmem.h include\google\protobuf\stubs\fastmem.h copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\hash.h include\google\protobuf\stubs\hash.h copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\once.h include\google\protobuf\stubs\once.h -copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\pbconfig.h include\google\protobuf\stubs\pbconfig.h copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\platform_macros.h include\google\protobuf\stubs\platform_macros.h copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\shared_ptr.h include\google\protobuf\stubs\shared_ptr.h copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\singleton.h include\google\protobuf\stubs\singleton.h |