diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2015-06-15 21:42:57 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-06-17 11:19:46 -0700 |
| commit | 818c5eee08840355d70d2f3bdf1a2f17986a5e70 (patch) | |
| tree | e6db0b1344385f8c48820c58d7297f653bff39f7 /cmake | |
| parent | e96ff30120a3834f7d1e31e43e591bf7cfbd731f (diff) | |
| download | protobuf-818c5eee08840355d70d2f3bdf1a2f17986a5e70.tar.gz protobuf-818c5eee08840355d70d2f3bdf1a2f17986a5e70.tar.bz2 protobuf-818c5eee08840355d70d2f3bdf1a2f17986a5e70.zip | |
Fix broken builds.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/extract_includes.bat.in | 1 | ||||
| -rw-r--r-- | cmake/libprotobuf-lite.cmake | 1 | ||||
| -rw-r--r-- | cmake/libprotobuf.cmake | 2 | ||||
| -rw-r--r-- | cmake/tests.cmake | 11 |
4 files changed, 12 insertions, 3 deletions
diff --git a/cmake/extract_includes.bat.in b/cmake/extract_includes.bat.in index d0c6dbfb..21c95748 100644 --- a/cmake/extract_includes.bat.in +++ b/cmake/extract_includes.bat.in @@ -89,6 +89,7 @@ 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 diff --git a/cmake/libprotobuf-lite.cmake b/cmake/libprotobuf-lite.cmake index 8d995df4..db55ea92 100644 --- a/cmake/libprotobuf-lite.cmake +++ b/cmake/libprotobuf-lite.cmake @@ -17,6 +17,7 @@ set(libprotobuf_lite_files ${protobuf_source_dir}/src/google/protobuf/stubs/statusor.cc ${protobuf_source_dir}/src/google/protobuf/stubs/stringpiece.cc ${protobuf_source_dir}/src/google/protobuf/stubs/stringprintf.cc + ${protobuf_source_dir}/src/google/protobuf/stubs/strutil.cc ${protobuf_source_dir}/src/google/protobuf/stubs/time.cc ${protobuf_source_dir}/src/google/protobuf/wire_format_lite.cc ) diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake index 850d93a7..53ba3d3e 100644 --- a/cmake/libprotobuf.cmake +++ b/cmake/libprotobuf.cmake @@ -26,7 +26,6 @@ set(libprotobuf_files ${protobuf_source_dir}/src/google/protobuf/struct.pb.cc ${protobuf_source_dir}/src/google/protobuf/stubs/mathlimits.cc ${protobuf_source_dir}/src/google/protobuf/stubs/structurally_valid.cc - ${protobuf_source_dir}/src/google/protobuf/stubs/strutil.cc ${protobuf_source_dir}/src/google/protobuf/stubs/substitute.cc ${protobuf_source_dir}/src/google/protobuf/text_format.cc ${protobuf_source_dir}/src/google/protobuf/timestamp.pb.cc @@ -44,6 +43,7 @@ set(libprotobuf_files ${protobuf_source_dir}/src/google/protobuf/util/internal/protostream_objectsource.cc ${protobuf_source_dir}/src/google/protobuf/util/internal/protostream_objectwriter.cc ${protobuf_source_dir}/src/google/protobuf/util/internal/type_info.cc + ${protobuf_source_dir}/src/google/protobuf/util/internal/type_info_test_helper.cc ${protobuf_source_dir}/src/google/protobuf/util/internal/utility.cc ${protobuf_source_dir}/src/google/protobuf/util/json_util.cc ${protobuf_source_dir}/src/google/protobuf/util/message_differencer.cc diff --git a/cmake/tests.cmake b/cmake/tests.cmake index 4396a657..16c94933 100644 --- a/cmake/tests.cmake +++ b/cmake/tests.cmake @@ -2,13 +2,20 @@ if (NOT EXISTS "${PROJECT_SOURCE_DIR}/../gmock/CMakeLists.txt") message(FATAL_ERROR "Cannot find gmock directory.") endif() -add_subdirectory(../gmock ${PROJECT_BINARY_DIR}/gmock) - include_directories( + ${protobuf_source_dir}/gmock + ${protobuf_source_dir}/gmock/gtest ${protobuf_source_dir}/gmock/gtest/include ${protobuf_source_dir}/gmock/include ) +add_library(gmock STATIC + ${protobuf_source_dir}/gmock/src/gmock-all.cc + ${protobuf_source_dir}/gmock/gtest/src/gtest-all.cc +) +add_library(gmock_main STATIC ${protobuf_source_dir}/gmock/src/gmock_main.cc) +target_link_libraries(gmock_main gmock) + set(lite_test_protos google/protobuf/map_lite_unittest.proto google/protobuf/unittest_import_lite.proto |