diff options
author | Jozef Izso <jozef.izso@gmail.com> | 2018-08-15 15:50:45 +0200 |
---|---|---|
committer | Jozef Izso <jozef.izso@gmail.com> | 2018-08-15 15:50:45 +0200 |
commit | d2c35ce4cb6ff767712a879f6bfad9d50ada577d (patch) | |
tree | a9d5bb8b15cac5c75884aada782d7584d011b1e3 /cmake/libprotobuf.cmake | |
parent | f2a1356966cef3889434368598ac888d131489fb (diff) | |
download | protobuf-d2c35ce4cb6ff767712a879f6bfad9d50ada577d.tar.gz protobuf-d2c35ce4cb6ff767712a879f6bfad9d50ada577d.tar.bz2 protobuf-d2c35ce4cb6ff767712a879f6bfad9d50ada577d.zip |
Backport the PR #4579 to 3.6.x branch
Implements #3380
Diffstat (limited to 'cmake/libprotobuf.cmake')
-rw-r--r-- | cmake/libprotobuf.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake index 65d05c19..463d65a3 100644 --- a/cmake/libprotobuf.cmake +++ b/cmake/libprotobuf.cmake @@ -112,8 +112,14 @@ set(libprotobuf_includes ${protobuf_source_dir}/src/google/protobuf/wrappers.pb.h ) +if (MSVC) +set(libprotoc_rc_files + ${CMAKE_CURRENT_BINARY_DIR}/version.rc +) +endif() + add_library(libprotobuf ${protobuf_SHARED_OR_STATIC} - ${libprotobuf_lite_files} ${libprotobuf_files} ${libprotobuf_includes}) + ${libprotobuf_lite_files} ${libprotobuf_files} ${libprotobuf_includes} ${libprotobuf_rc_files}) target_link_libraries(libprotobuf ${CMAKE_THREAD_LIBS_INIT}) if(protobuf_WITH_ZLIB) target_link_libraries(libprotobuf ${ZLIB_LIBRARIES}) |