diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2018-07-17 18:50:04 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-17 18:50:04 -0700 |
commit | d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e (patch) | |
tree | 6224f98ad30e99dc2d896423853892f2142f16ed /cmake/libprotoc.cmake | |
parent | 22503a01722939385a7584c3b65f1c43dc5b2ef8 (diff) | |
parent | 8356d270a54e18c21f4feac6f5e2b6f1061dc8d5 (diff) | |
download | protobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.tar.gz protobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.tar.bz2 protobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.zip |
Merge pull request #4924 from xfxyjwf/3.6.x
Cherry-pick master build fixes and kokoro changes to 3.6.x
Diffstat (limited to 'cmake/libprotoc.cmake')
-rw-r--r-- | cmake/libprotoc.cmake | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/cmake/libprotoc.cmake b/cmake/libprotoc.cmake index ec6958bc..58568bb2 100644 --- a/cmake/libprotoc.cmake +++ b/cmake/libprotoc.cmake @@ -161,17 +161,11 @@ set(libprotoc_headers ${protobuf_source_dir}/src/google/protobuf/compiler/zip_writer.h ) -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 +if (MSVC) +set(libprotoc_rc_files + ${CMAKE_CURRENT_BINARY_DIR}/version.rc ) +endif() add_library(libprotoc ${protobuf_SHARED_OR_STATIC} ${libprotoc_files} ${libprotoc_headers}) |