Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(365)

Side by Side Diff: third_party/protobuf/cmake/tests.cmake

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 if (NOT EXISTS "${PROJECT_SOURCE_DIR}/../gmock/CMakeLists.txt") 1 if (NOT EXISTS "${PROJECT_SOURCE_DIR}/../gmock/CMakeLists.txt")
2 message(FATAL_ERROR "Cannot find gmock directory.") 2 message(FATAL_ERROR "Cannot find gmock directory.")
3 endif() 3 endif()
4 4
5 option(protobuf_ABSOLUTE_TEST_PLUGIN_PATH 5 option(protobuf_ABSOLUTE_TEST_PLUGIN_PATH
6 "Using absolute test_plugin path in tests" ON) 6 "Using absolute test_plugin path in tests" ON)
7 mark_as_advanced(protobuf_ABSOLUTE_TEST_PLUGIN_PATH)
7 8
8 include_directories( 9 include_directories(
9 ${protobuf_source_dir}/gmock 10 ${protobuf_source_dir}/gmock
10 ${protobuf_source_dir}/gmock/gtest 11 ${protobuf_source_dir}/gmock/gtest
11 ${protobuf_source_dir}/gmock/gtest/include 12 ${protobuf_source_dir}/gmock/gtest/include
12 ${protobuf_source_dir}/gmock/include 13 ${protobuf_source_dir}/gmock/include
13 ) 14 )
14 15
15 add_library(gmock STATIC 16 add_library(gmock STATIC
16 ${protobuf_source_dir}/gmock/src/gmock-all.cc 17 ${protobuf_source_dir}/gmock/src/gmock-all.cc
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 google/protobuf/unittest_proto3_arena_lite.proto 56 google/protobuf/unittest_proto3_arena_lite.proto
56 google/protobuf/unittest_proto3_lite.proto 57 google/protobuf/unittest_proto3_lite.proto
57 google/protobuf/unittest_well_known_types.proto 58 google/protobuf/unittest_well_known_types.proto
58 google/protobuf/util/internal/testdata/anys.proto 59 google/protobuf/util/internal/testdata/anys.proto
59 google/protobuf/util/internal/testdata/books.proto 60 google/protobuf/util/internal/testdata/books.proto
60 google/protobuf/util/internal/testdata/default_value.proto 61 google/protobuf/util/internal/testdata/default_value.proto
61 google/protobuf/util/internal/testdata/default_value_test.proto 62 google/protobuf/util/internal/testdata/default_value_test.proto
62 google/protobuf/util/internal/testdata/field_mask.proto 63 google/protobuf/util/internal/testdata/field_mask.proto
63 google/protobuf/util/internal/testdata/maps.proto 64 google/protobuf/util/internal/testdata/maps.proto
64 google/protobuf/util/internal/testdata/oneofs.proto 65 google/protobuf/util/internal/testdata/oneofs.proto
66 google/protobuf/util/internal/testdata/proto3.proto
65 google/protobuf/util/internal/testdata/struct.proto 67 google/protobuf/util/internal/testdata/struct.proto
66 google/protobuf/util/internal/testdata/timestamp_duration.proto 68 google/protobuf/util/internal/testdata/timestamp_duration.proto
69 google/protobuf/util/internal/testdata/wrappers.proto
67 google/protobuf/util/json_format_proto3.proto 70 google/protobuf/util/json_format_proto3.proto
68 google/protobuf/util/message_differencer_unittest.proto 71 google/protobuf/util/message_differencer_unittest.proto
69 ) 72 )
70 73
71 macro(compile_proto_file filename) 74 macro(compile_proto_file filename)
72 get_filename_component(dirname ${filename} PATH) 75 get_filename_component(dirname ${filename} PATH)
73 get_filename_component(basename ${filename} NAME_WE) 76 get_filename_component(basename ${filename} NAME_WE)
74 add_custom_command( 77 add_custom_command(
75 OUTPUT ${protobuf_source_dir}/src/${dirname}/${basename}.pb.cc 78 OUTPUT ${protobuf_source_dir}/src/${dirname}/${basename}.pb.cc
76 DEPENDS protoc ${protobuf_source_dir}/src/${dirname}/${basename}.proto 79 DEPENDS protoc ${protobuf_source_dir}/src/${dirname}/${basename}.proto
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 208
206 set(lite_arena_test_files 209 set(lite_arena_test_files
207 ${protobuf_source_dir}/src/google/protobuf/lite_arena_unittest.cc 210 ${protobuf_source_dir}/src/google/protobuf/lite_arena_unittest.cc
208 ) 211 )
209 add_executable(lite-arena-test ${lite_arena_test_files} ${common_lite_test_files } ${lite_test_proto_files}) 212 add_executable(lite-arena-test ${lite_arena_test_files} ${common_lite_test_files } ${lite_test_proto_files})
210 target_link_libraries(lite-arena-test libprotobuf-lite gmock_main) 213 target_link_libraries(lite-arena-test libprotobuf-lite gmock_main)
211 214
212 add_custom_target(check 215 add_custom_target(check
213 COMMAND tests 216 COMMAND tests
214 WORKING_DIRECTORY ${protobuf_source_dir}) 217 WORKING_DIRECTORY ${protobuf_source_dir})
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698