From accac885d8f87943fd9f6daeae811d3bbe2dabb9 Mon Sep 17 00:00:00 2001 From: Andi Burch Date: Fri, 5 Jun 2020 21:21:34 +0200 Subject: [protobuf] Don't redefine PROTOBUF_USE_DLLS (#11516) * [protobuf] Don't redefine PROTOBUF_USE_DLLS * [protobuf] Increased version in CONTROL after merge from master. --- ports/protobuf/CONTROL | 2 +- 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() -- cgit v1.2.3