diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-02-02 11:47:31 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-02 11:47:31 -0800 |
| commit | 82e02316072f38f994395b1620cda2aff927dd0f (patch) | |
| tree | 9c377aacc457c837acdcd8a89db11a7b0639ee18 /cmake | |
| parent | 5dad7cce19352505f0d93eefed9f170a4d9818fe (diff) | |
| parent | 1ec9beb477a2c8c4e77b6e6c9046ea634019644d (diff) | |
| download | protobuf-82e02316072f38f994395b1620cda2aff927dd0f.tar.gz protobuf-82e02316072f38f994395b1620cda2aff927dd0f.tar.bz2 protobuf-82e02316072f38f994395b1620cda2aff927dd0f.zip | |
Merge pull request #4259 from Mizux/master
Various CMake Update
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | cmake/libprotobuf-lite.cmake | 2 | ||||
| -rw-r--r-- | cmake/libprotobuf.cmake | 2 | ||||
| -rw-r--r-- | cmake/libprotoc.cmake | 2 | ||||
| -rw-r--r-- | cmake/protoc.cmake | 1 |
5 files changed, 12 insertions, 5 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 2351392d..bf3f8863 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -8,6 +8,10 @@ endif() # CMake policies cmake_policy(SET CMP0022 NEW) +if(POLICY CMP0048) + cmake_policy(SET CMP0048 NEW) +endif() + # Project project(protobuf C CXX) @@ -24,11 +28,7 @@ option(protobuf_BUILD_SHARED_LIBS "Build Shared Libraries" ${protobuf_BUILD_SHAR include(CMakeDependentOption) cmake_dependent_option(protobuf_MSVC_STATIC_RUNTIME "Link static runtime libraries" ON "NOT protobuf_BUILD_SHARED_LIBS" OFF) -if (MSVC) - set(protobuf_WITH_ZLIB_DEFAULT OFF) -else (MSVC) - set(protobuf_WITH_ZLIB_DEFAULT ON) -endif (MSVC) +set(protobuf_WITH_ZLIB_DEFAULT ON) option(protobuf_WITH_ZLIB "Build with zlib support" ${protobuf_WITH_ZLIB_DEFAULT}) set(protobuf_DEBUG_POSTFIX "d" CACHE STRING "Default debug postfix") diff --git a/cmake/libprotobuf-lite.cmake b/cmake/libprotobuf-lite.cmake index f5242d4f..2df6a293 100644 --- a/cmake/libprotobuf-lite.cmake +++ b/cmake/libprotobuf-lite.cmake @@ -62,5 +62,7 @@ if(MSVC AND protobuf_BUILD_SHARED_LIBS) PRIVATE LIBPROTOBUF_EXPORTS) endif() set_target_properties(libprotobuf-lite PROPERTIES + VERSION ${protobuf_VERSION} OUTPUT_NAME ${LIB_PREFIX}protobuf-lite DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") +add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite) diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake index 72db915b..65d05c19 100644 --- a/cmake/libprotobuf.cmake +++ b/cmake/libprotobuf.cmake @@ -125,5 +125,7 @@ if(MSVC AND protobuf_BUILD_SHARED_LIBS) PRIVATE LIBPROTOBUF_EXPORTS) endif() set_target_properties(libprotobuf PROPERTIES + VERSION ${protobuf_VERSION} OUTPUT_NAME ${LIB_PREFIX}protobuf DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") +add_library(protobuf::libprotobuf ALIAS libprotobuf) diff --git a/cmake/libprotoc.cmake b/cmake/libprotoc.cmake index 107c1c52..5f6d078c 100644 --- a/cmake/libprotoc.cmake +++ b/cmake/libprotoc.cmake @@ -225,5 +225,7 @@ if(MSVC AND protobuf_BUILD_SHARED_LIBS) endif() set_target_properties(libprotoc PROPERTIES COMPILE_DEFINITIONS LIBPROTOC_EXPORTS + VERSION ${protobuf_VERSION} OUTPUT_NAME ${LIB_PREFIX}protoc DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") +add_library(protobuf::libprotoc ALIAS libprotoc) diff --git a/cmake/protoc.cmake b/cmake/protoc.cmake index 4f07c389..5777b16e 100644 --- a/cmake/protoc.cmake +++ b/cmake/protoc.cmake @@ -4,3 +4,4 @@ set(protoc_files add_executable(protoc ${protoc_files}) target_link_libraries(protoc libprotobuf libprotoc) +add_executable(protobuf::protoc ALIAS protoc) |