aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2018-06-01 11:00:04 -0700
committerFeng Xiao <xfxyjwf@gmail.com>2018-07-16 17:40:11 -0700
commitb3e4e3abe0d2f79ec9f1e4e24e12dc642d662546 (patch)
tree9d43c05dc327203c523b76a0e487c91ca5a55c16 /cmake
parent0b3b4708a940337c38e69138e55ece4360e0484d (diff)
downloadprotobuf-b3e4e3abe0d2f79ec9f1e4e24e12dc642d662546.tar.gz
protobuf-b3e4e3abe0d2f79ec9f1e4e24e12dc642d662546.tar.bz2
protobuf-b3e4e3abe0d2f79ec9f1e4e24e12dc642d662546.zip
Remove js_embed binary. (#4709)
* Remove js_embed binary.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/libprotoc.cmake14
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})