diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-05-02 22:57:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-02 22:57:43 -0700 |
| commit | 050e71d01dc9e65e6cdf1d13534fc14889e4ae38 (patch) | |
| tree | 7e39943693b8ac392f37d43a03c66815c6048963 /ports/nanopb | |
| parent | b72f36e8cdd96ec482785e33f72f99cceebda8ad (diff) | |
| download | vcpkg-050e71d01dc9e65e6cdf1d13534fc14889e4ae38.tar.gz vcpkg-050e71d01dc9e65e6cdf1d13534fc14889e4ae38.zip | |
Remove references to CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS (#5937)
* [various ports] remove references to CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS
* [alac,benchmark,capnproto] Fix check_linkage call
* [fastlz] Fix SHA512
* [coroutine] Fix dynamic build
* [folly] Find double-conversion
* [gamma] Use vcpkg_from_github
* [librsync] Enable static builds
* [netcdf-cxx4] Fix SHA512
* [octomap] Fix static build
* [tidy-html5] Fix static build
* [various ports] remove custom messages for shared/static builds, modernize some scripts in the meantime
* [folly] Use ras0219's fix for link paths
* [octomap] Fix exported targets
* [uvatlas] Set tool download SHA512
* [duktape+python2] fix portfile to call configure with correct python version, manage python2 also outside win32
* [suitesparse] osx fix
* [gtkmm] Call vcpkg_check_linkage after including vcpkg functions
* [duktape] Resolve conflicts
* [duktape] FIxed typo in Python paths
* [wangle] Find zlib
* [openssl-uwp] Fix SHA512
* [glib] Allow static builds on non-Windows
* [suitesparse] Fix build on Windows
* [multiple ports] Bump CONTROL version
* [multiple ports] Fix description indent
* [directxtk] Fix CONTROL file
* [bde,duktape,qpid-proton] Build packages with python2 installed
* [binn] remove CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS
* [gdal,live555,uriparser] Fix regressions
* [live555] Update to 2019.04.24
Diffstat (limited to 'ports/nanopb')
| -rw-r--r-- | ports/nanopb/CONTROL | 2 | ||||
| -rw-r--r-- | ports/nanopb/portfile.cmake | 10 | ||||
| -rw-r--r-- | ports/nanopb/shared-lib.patch | 22 |
3 files changed, 2 insertions, 32 deletions
diff --git a/ports/nanopb/CONTROL b/ports/nanopb/CONTROL index 0916582fe..40d18ea9e 100644 --- a/ports/nanopb/CONTROL +++ b/ports/nanopb/CONTROL @@ -1,3 +1,3 @@ Source: nanopb
-Version: 2019-02-12-1
+Version: 2019-02-12-2
Description: A small code-size Protocol Buffers implementation in ANSI C.
diff --git a/ports/nanopb/portfile.cmake b/ports/nanopb/portfile.cmake index 278b3c7bb..35d662c40 100644 --- a/ports/nanopb/portfile.cmake +++ b/ports/nanopb/portfile.cmake @@ -1,12 +1,6 @@ include(vcpkg_common_functions)
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
- message(WARNING "\
-The author of nanopb advises using this lib as a static library. \
-For more details, please visit: \
-https://github.com/nanopb/nanopb/pull/383#issuecomment-467852459"
- )
-endif ()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
message(WARNING "\
The nanopb's code generator is not installed as part of the installation \
@@ -19,8 +13,6 @@ vcpkg_from_github( REF d1305ddef1c18b4cb33992254494ccd255701aaa
SHA512 70e588b0ff13846005658a9fafe57551dc2c126a32f351fe0b6c166c142c42b3bcc44567288f609f2f3a5adc1fe1bf1c585fec8c5fe90817b5b3ab47955aa1fc
HEAD_REF master
- PATCHES
- shared-lib.patch
)
string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" BUILD_STATIC_LIBS)
diff --git a/ports/nanopb/shared-lib.patch b/ports/nanopb/shared-lib.patch deleted file mode 100644 index 0d5960e72..000000000 --- a/ports/nanopb/shared-lib.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b818734..174b650 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -67,6 +67,7 @@ endif() - - if(nanopb_BUILD_RUNTIME) - if(BUILD_SHARED_LIBS) -+ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) - add_library(protobuf-nanopb SHARED - pb.h - pb_common.h -@@ -79,7 +80,8 @@ if(nanopb_BUILD_RUNTIME) - SOVERSION ${nanopb_SOVERSION}) - install(TARGETS protobuf-nanopb EXPORT nanopb-targets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - target_include_directories(protobuf-nanopb INTERFACE - $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> - ) |
