diff options
| author | Adam Cozzette <acozzette@gmail.com> | 2016-12-19 14:49:11 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-19 14:49:11 -0800 |
| commit | fb15862baccbde38a3924f89922a86df2c9a20e0 (patch) | |
| tree | 92c807fbc08d380af42b5e348d06364d04a6e287 /cmake | |
| parent | f39cf88a347767d25572f7344eab44359d872925 (diff) | |
| parent | 98d89d427708af776eba79850060dccca7882a5a (diff) | |
| download | protobuf-fb15862baccbde38a3924f89922a86df2c9a20e0.tar.gz protobuf-fb15862baccbde38a3924f89922a86df2c9a20e0.tar.bz2 protobuf-fb15862baccbde38a3924f89922a86df2c9a20e0.zip | |
Merge pull request #2517 from acozzette/js-embed
Auto-generate well_known_types_embed.cc
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/libprotoc.cmake | 12 | ||||
| -rw-r--r-- | cmake/tests.cmake | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/cmake/libprotoc.cmake b/cmake/libprotoc.cmake index 2d238449..215abcd8 100644 --- a/cmake/libprotoc.cmake +++ b/cmake/libprotoc.cmake @@ -94,6 +94,18 @@ set(libprotoc_files ${protobuf_source_dir}/src/google/protobuf/compiler/zip_writer.cc ) +set(js_well_known_types_sources, + ${protobuf_source_dir}/src/google/protobuf/compiler/js/well_known_types/any.js + ${protobuf_source_dir}/src/google/protobuf/compiler/js/well_known_types/struct.js + ${protobuf_source_dir}/src/google/protobuf/compiler/js/well_known_types/timestamp.js +) +add_executable(js_embed ${protobuf_source_dir}/src/google/protobuf/compiler/js/embed.cc) +add_custom_command( + OUTPUT ${protobuf_source_dir}/src/google/protobuf/compiler/js/well_known_types_embed.cc + DEPENDS js_embed ${js_well_known_types_sources} + COMMAND js_embed ${js_well_known_types_sources} > ${protobuf_source_dir}/src/google/protobuf/compiler/js/well_known_types_embed.cc +) + add_library(libprotoc ${protobuf_SHARED_OR_STATIC} ${libprotoc_files}) target_link_libraries(libprotoc libprotobuf) diff --git a/cmake/tests.cmake b/cmake/tests.cmake index 30214e7d..bf8e5a6c 100644 --- a/cmake/tests.cmake +++ b/cmake/tests.cmake @@ -214,4 +214,5 @@ target_link_libraries(lite-arena-test libprotobuf-lite gmock_main) add_custom_target(check COMMAND tests + DEPENDS tests test_plugin WORKING_DIRECTORY ${protobuf_source_dir}) |