From c3aa4c2675f993f3e6601547f03d76fd93183628 Mon Sep 17 00:00:00 2001 From: Konstantin Podsvirov Date: Thu, 15 Oct 2015 02:56:48 +0300 Subject: Improved SHARED build from CMake project --- cmake/libprotoc.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'cmake/libprotoc.cmake') diff --git a/cmake/libprotoc.cmake b/cmake/libprotoc.cmake index 497861ff..7424ff02 100644 --- a/cmake/libprotoc.cmake +++ b/cmake/libprotoc.cmake @@ -89,8 +89,14 @@ set(libprotoc_files ${protobuf_source_dir}/src/google/protobuf/compiler/zip_writer.cc ) -add_library(libprotoc ${libprotoc_files}) +add_library(libprotoc ${protobuf_SHARED_OR_STATIC} + ${libprotoc_files}) target_link_libraries(libprotoc libprotobuf) +if(MSVC AND protobuf_BUILD_SHARED_LIBS) + target_compile_definitions(libprotoc + PUBLIC PROTOBUF_USE_DLLS + PRIVATE LIBPROTOC_EXPORTS) +endif() set_target_properties(libprotoc PROPERTIES COMPILE_DEFINITIONS LIBPROTOC_EXPORTS OUTPUT_NAME ${LIB_PREFIX}protoc -- cgit v1.2.3