diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-13 12:58:55 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-13 14:41:27 -0700 |
| commit | bde4eaf137c5c5ee3f6ffa4288307750d95c6281 (patch) | |
| tree | 6a67c40a8f187055fd0e7e3ffc4f3dee63b1bf93 /cmake | |
| parent | 4c70c9cb179099349d2eed8e0c8601399bb562b1 (diff) | |
| download | protobuf-bde4eaf137c5c5ee3f6ffa4288307750d95c6281.tar.gz protobuf-bde4eaf137c5c5ee3f6ffa4288307750d95c6281.tar.bz2 protobuf-bde4eaf137c5c5ee3f6ffa4288307750d95c6281.zip | |
Update build files.
* Fixes https://github.com/google/protobuf/issues/5031
* Fixes https://github.com/google/protobuf/issues/5037
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/extract_includes.bat.in | 3 | ||||
| -rw-r--r-- | cmake/tests.cmake | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/cmake/extract_includes.bat.in b/cmake/extract_includes.bat.in index 9fd9de0d..3818c4ef 100644 --- a/cmake/extract_includes.bat.in +++ b/cmake/extract_includes.bat.in @@ -72,6 +72,9 @@ copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\message.h" include\go copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\message_lite.h" include\google\protobuf\message_lite.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\metadata.h" include\google\protobuf\metadata.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\metadata_lite.h" include\google\protobuf\metadata_lite.h +copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\port.h" include\google\protobuf\port.h +copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\port_def.inc" include\google\protobuf\port_def.inc +copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\port_undef.inc" include\google\protobuf\port_undef.inc copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\reflection.h" include\google\protobuf\reflection.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\reflection_ops.h" include\google\protobuf\reflection_ops.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\repeated_field.h" include\google\protobuf\repeated_field.h diff --git a/cmake/tests.cmake b/cmake/tests.cmake index 001b4200..f4679d1a 100644 --- a/cmake/tests.cmake +++ b/cmake/tests.cmake @@ -168,6 +168,7 @@ set(tests_files ${protobuf_source_dir}/src/google/protobuf/proto3_arena_lite_unittest.cc ${protobuf_source_dir}/src/google/protobuf/proto3_arena_unittest.cc ${protobuf_source_dir}/src/google/protobuf/proto3_lite_unittest.cc + ${protobuf_source_dir}/src/google/protobuf/proto3_lite_unittest.inc ${protobuf_source_dir}/src/google/protobuf/reflection_ops_unittest.cc ${protobuf_source_dir}/src/google/protobuf/repeated_field_reflection_unittest.cc ${protobuf_source_dir}/src/google/protobuf/repeated_field_unittest.cc |