diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-01-11 12:44:31 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-01-11 12:44:31 -0800 |
| commit | 57c78037a4a8f0f7384504475c5510984657f0d2 (patch) | |
| tree | 91928048e7001ea224d68da54d9bb43cbbd7970f /ports/protobuf/version-rc-msvc.patch | |
| parent | bf4a864a73dfe0f68a70598c9f5087beca57f2c7 (diff) | |
| parent | 1134de5eacf2052a936a943acea7f08ba06462d7 (diff) | |
| download | vcpkg-57c78037a4a8f0f7384504475c5510984657f0d2.tar.gz vcpkg-57c78037a4a8f0f7384504475c5510984657f0d2.zip | |
Merge branch 'master' into dev/philc/4990
Diffstat (limited to 'ports/protobuf/version-rc-msvc.patch')
| -rw-r--r-- | ports/protobuf/version-rc-msvc.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/ports/protobuf/version-rc-msvc.patch b/ports/protobuf/version-rc-msvc.patch new file mode 100644 index 000000000..b24a862d9 --- /dev/null +++ b/ports/protobuf/version-rc-msvc.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/protoc.cmake b/cmake/protoc.cmake
+index 9bf6f5a..b58a12a 100644
+--- a/cmake/protoc.cmake
++++ b/cmake/protoc.cmake
+@@ -2,9 +2,11 @@ set(protoc_files
+ ${protobuf_source_dir}/src/google/protobuf/compiler/main.cc
+ )
+
++if(MSVC)
+ set(protoc_rc_files
+ ${CMAKE_CURRENT_BINARY_DIR}/version.rc
+ )
++endif()
+
+ add_executable(protoc ${protoc_files} ${protoc_rc_files})
+ target_link_libraries(protoc libprotobuf libprotoc)
|