[protobuf] Don't redefine PROTOBUF_USE_DLLS (#11516)

* [protobuf] Don't redefine PROTOBUF_USE_DLLS

* [protobuf] Increased version in CONTROL after merge from master.
This commit is contained in:
Andi Burch 2020-06-05 21:21:34 +02:00 committed by GitHub
parent b4f3e5854a
commit accac885d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -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

View File

@ -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()