diff options
author | Feng Xiao <xiaofeng@google.com> | 2015-10-16 14:08:38 -0700 |
---|---|---|
committer | Feng Xiao <xiaofeng@google.com> | 2015-10-16 14:08:38 -0700 |
commit | 5314ad1b215c95b46a000794a08139d0a3077d74 (patch) | |
tree | 8aebd22910ae786aea08bdea890dbe74a4db8c15 /cmake/libprotoc.cmake | |
parent | beeb3aa74ca22348df4342c50a12b0f11efcde9d (diff) | |
parent | c3aa4c2675f993f3e6601547f03d76fd93183628 (diff) | |
download | protobuf-5314ad1b215c95b46a000794a08139d0a3077d74.tar.gz protobuf-5314ad1b215c95b46a000794a08139d0a3077d74.tar.bz2 protobuf-5314ad1b215c95b46a000794a08139d0a3077d74.zip |
Merge pull request #783 from podsvirov/topic-cmake-project
Improved CMake project
Diffstat (limited to 'cmake/libprotoc.cmake')
-rw-r--r-- | cmake/libprotoc.cmake | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cmake/libprotoc.cmake b/cmake/libprotoc.cmake index 35e5faf2..1ee87b43 100644 --- a/cmake/libprotoc.cmake +++ b/cmake/libprotoc.cmake @@ -90,8 +90,15 @@ 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) + OUTPUT_NAME ${LIB_PREFIX}protoc + DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") |