diff options
| author | Andi Burch <andi.burch@gmail.com> | 2020-06-05 21:21:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-05 12:21:34 -0700 |
| commit | accac885d8f87943fd9f6daeae811d3bbe2dabb9 (patch) | |
| tree | a669556c9701a2793a247b0e8a8ae345a1c7bd01 | |
| parent | b4f3e5854a115c18ed72219afec3d87fbaa9f3be (diff) | |
| download | vcpkg-accac885d8f87943fd9f6daeae811d3bbe2dabb9.tar.gz vcpkg-accac885d8f87943fd9f6daeae811d3bbe2dabb9.zip | |
[protobuf] Don't redefine PROTOBUF_USE_DLLS (#11516)
* [protobuf] Don't redefine PROTOBUF_USE_DLLS
* [protobuf] Increased version in CONTROL after merge from master.
| -rw-r--r-- | ports/protobuf/CONTROL | 2 | ||||
| -rw-r--r-- | ports/protobuf/portfile.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL index 5a72ae6fb..0feaaed4c 100644 --- a/ports/protobuf/CONTROL +++ b/ports/protobuf/CONTROL @@ -1,5 +1,5 @@ Source: protobuf -Version: 3.12.0-1 +Version: 3.12.0-2 Homepage: https://github.com/google/protobuf Description: Protocol Buffers - Google's data interchange format diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index 8ddd9fe23..6a27a95de 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -115,7 +115,7 @@ endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(READ ${CURRENT_PACKAGES_DIR}/include/google/protobuf/stubs/platform_macros.h _contents) - string(REPLACE "\#endif // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_" "\#define PROTOBUF_USE_DLLS\n\#endif // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_" _contents "${_contents}") + string(REPLACE "\#endif // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_" "\#ifndef PROTOBUF_USE_DLLS\n\#define PROTOBUF_USE_DLLS\n\#endif // PROTOBUF_USE_DLLS\n\n\#endif // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_" _contents "${_contents}") file(WRITE ${CURRENT_PACKAGES_DIR}/include/google/protobuf/stubs/platform_macros.h "${_contents}") endif() |