| OLD | NEW |
| 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) | |
| 8 | 7 |
| 9 include_directories( | 8 include_directories( |
| 10 ${protobuf_source_dir}/gmock | 9 ${protobuf_source_dir}/gmock |
| 11 ${protobuf_source_dir}/gmock/gtest | 10 ${protobuf_source_dir}/gmock/gtest |
| 12 ${protobuf_source_dir}/gmock/gtest/include | 11 ${protobuf_source_dir}/gmock/gtest/include |
| 13 ${protobuf_source_dir}/gmock/include | 12 ${protobuf_source_dir}/gmock/include |
| 14 ) | 13 ) |
| 15 | 14 |
| 16 add_library(gmock STATIC | 15 add_library(gmock STATIC |
| 17 ${protobuf_source_dir}/gmock/src/gmock-all.cc | 16 ${protobuf_source_dir}/gmock/src/gmock-all.cc |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 google/protobuf/unittest_proto3_arena_lite.proto | 55 google/protobuf/unittest_proto3_arena_lite.proto |
| 57 google/protobuf/unittest_proto3_lite.proto | 56 google/protobuf/unittest_proto3_lite.proto |
| 58 google/protobuf/unittest_well_known_types.proto | 57 google/protobuf/unittest_well_known_types.proto |
| 59 google/protobuf/util/internal/testdata/anys.proto | 58 google/protobuf/util/internal/testdata/anys.proto |
| 60 google/protobuf/util/internal/testdata/books.proto | 59 google/protobuf/util/internal/testdata/books.proto |
| 61 google/protobuf/util/internal/testdata/default_value.proto | 60 google/protobuf/util/internal/testdata/default_value.proto |
| 62 google/protobuf/util/internal/testdata/default_value_test.proto | 61 google/protobuf/util/internal/testdata/default_value_test.proto |
| 63 google/protobuf/util/internal/testdata/field_mask.proto | 62 google/protobuf/util/internal/testdata/field_mask.proto |
| 64 google/protobuf/util/internal/testdata/maps.proto | 63 google/protobuf/util/internal/testdata/maps.proto |
| 65 google/protobuf/util/internal/testdata/oneofs.proto | 64 google/protobuf/util/internal/testdata/oneofs.proto |
| 66 google/protobuf/util/internal/testdata/proto3.proto | |
| 67 google/protobuf/util/internal/testdata/struct.proto | 65 google/protobuf/util/internal/testdata/struct.proto |
| 68 google/protobuf/util/internal/testdata/timestamp_duration.proto | 66 google/protobuf/util/internal/testdata/timestamp_duration.proto |
| 69 google/protobuf/util/internal/testdata/wrappers.proto | |
| 70 google/protobuf/util/json_format_proto3.proto | 67 google/protobuf/util/json_format_proto3.proto |
| 71 google/protobuf/util/message_differencer_unittest.proto | 68 google/protobuf/util/message_differencer_unittest.proto |
| 72 ) | 69 ) |
| 73 | 70 |
| 74 macro(compile_proto_file filename) | 71 macro(compile_proto_file filename) |
| 75 get_filename_component(dirname ${filename} PATH) | 72 get_filename_component(dirname ${filename} PATH) |
| 76 get_filename_component(basename ${filename} NAME_WE) | 73 get_filename_component(basename ${filename} NAME_WE) |
| 77 add_custom_command( | 74 add_custom_command( |
| 78 OUTPUT ${protobuf_source_dir}/src/${dirname}/${basename}.pb.cc | 75 OUTPUT ${protobuf_source_dir}/src/${dirname}/${basename}.pb.cc |
| 79 DEPENDS protoc ${protobuf_source_dir}/src/${dirname}/${basename}.proto | 76 DEPENDS protoc ${protobuf_source_dir}/src/${dirname}/${basename}.proto |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 208 | 205 |
| 209 set(lite_arena_test_files | 206 set(lite_arena_test_files |
| 210 ${protobuf_source_dir}/src/google/protobuf/lite_arena_unittest.cc | 207 ${protobuf_source_dir}/src/google/protobuf/lite_arena_unittest.cc |
| 211 ) | 208 ) |
| 212 add_executable(lite-arena-test ${lite_arena_test_files} ${common_lite_test_files
} ${lite_test_proto_files}) | 209 add_executable(lite-arena-test ${lite_arena_test_files} ${common_lite_test_files
} ${lite_test_proto_files}) |
| 213 target_link_libraries(lite-arena-test libprotobuf-lite gmock_main) | 210 target_link_libraries(lite-arena-test libprotobuf-lite gmock_main) |
| 214 | 211 |
| 215 add_custom_target(check | 212 add_custom_target(check |
| 216 COMMAND tests | 213 COMMAND tests |
| 217 WORKING_DIRECTORY ${protobuf_source_dir}) | 214 WORKING_DIRECTORY ${protobuf_source_dir}) |
| OLD | NEW |