diff options
| author | Stephane Lajoie <dada@typicus.org> | 2017-07-07 22:30:36 -0400 |
|---|---|---|
| committer | Stephane Lajoie <dada@typicus.org> | 2017-07-07 22:30:36 -0400 |
| commit | c2f1a2af59d911b79dbe63a23815c4bfa472e2a6 (patch) | |
| tree | 90cc452ce24b3981e0653ae956f77fbfd4b05b1a /ports/protobuf | |
| parent | b5cd10bc66b785fdc385c16cfddc503324ba8e53 (diff) | |
| parent | 426df16b57c325928e6d587dc385dc836712a6b1 (diff) | |
| download | vcpkg-c2f1a2af59d911b79dbe63a23815c4bfa472e2a6.tar.gz vcpkg-c2f1a2af59d911b79dbe63a23815c4bfa472e2a6.zip | |
Merge branch 'master' into add-llvm
Diffstat (limited to 'ports/protobuf')
| -rw-r--r-- | ports/protobuf/CONTROL | 2 | ||||
| -rw-r--r-- | ports/protobuf/portfile.cmake | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL index 43e4ad1e8..2ba75ed23 100644 --- a/ports/protobuf/CONTROL +++ b/ports/protobuf/CONTROL @@ -1,4 +1,4 @@ Source: protobuf -Version: 3.3.0-1 +Version: 3.3.0-2 Build-Depends: zlib Description: Protocol Buffers - Google's data interchange format
\ No newline at end of file diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index 852086ff5..52574ecee 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -85,6 +85,16 @@ else() protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin/protoc.exe) endif() +foreach(FILE ${CURRENT_PACKAGES_DIR}/include/google/protobuf/arena.h ${CURRENT_PACKAGES_DIR}/include/google/protobuf/stubs/port.h) + file(READ ${FILE} _contents) + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + string(REPLACE "defined(PROTOBUF_USE_DLLS)" "1" _contents ${_contents}) + else() + string(REPLACE "defined(PROTOBUF_USE_DLLS)" "0" _contents ${_contents}) + endif() + file(WRITE ${FILE} ${_contents}) +endforeach() + file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/protobuf RENAME copyright) file(INSTALL ${TOOL_PATH}/bin/protoc.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools) vcpkg_copy_pdbs() |