mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 02:19:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[nanopb] update to 0.4.9 (#41469)

Browse Source
This commit is contained in:
Jia Yue Hua 2024-10-11 22:38:55 +08:00 committed by GitHub
parent db093c93c0
commit 68304c9a0c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ports/nanopb/fix-cmakelist.patch
View File

@ -1,12 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 273a841..02fb40c 100644 index 301501d..c7e8e42 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -16,11 +16,6 @@ option(nanopb_MSVC_STATIC_RUNTIME "Link static runtime libraries" ON) @@ -16,12 +16,6 @@ option(nanopb_MSVC_STATIC_RUNTIME "Link static runtime libraries" ON)
set(nanopb_PYTHON_INSTDIR_OVERRIDE "" CACHE PATH "Override the default python installation directory with the given path") set(nanopb_PYTHON_INSTDIR_OVERRIDE "" CACHE PATH "Override the default python installation directory with the given path")
-find_program(nanopb_PROTOC_PATH protoc HINTS generator-bin generator) -find_program(nanopb_PROTOC_PATH protoc PATHS generator-bin generator NO_DEFAULT_PATH)
-find_program(nanopb_PROTOC_PATH protoc)
-if(NOT EXISTS ${nanopb_PROTOC_PATH}) -if(NOT EXISTS ${nanopb_PROTOC_PATH})
- message(FATAL_ERROR "protoc compiler not found") - message(FATAL_ERROR "protoc compiler not found")
-endif() -endif()
@ -14,7 +15,7 @@ index 273a841..02fb40c 100644
if(NOT DEFINED CMAKE_DEBUG_POSTFIX) if(NOT DEFINED CMAKE_DEBUG_POSTFIX)
set(CMAKE_DEBUG_POSTFIX "d") set(CMAKE_DEBUG_POSTFIX "d")
endif() endif()
@@ -43,7 +38,6 @@ endif() @@ -44,7 +38,6 @@ endif()
# Determine Python module installation path # Determine Python module installation path
if (NOT nanopb_PYTHON_INSTDIR_OVERRIDE) if (NOT nanopb_PYTHON_INSTDIR_OVERRIDE)
@ -22,7 +23,7 @@ index 273a841..02fb40c 100644
file(TO_CMAKE_PATH "${Python_SITELIB}" PYTHON_INSTDIR) file(TO_CMAKE_PATH "${Python_SITELIB}" PYTHON_INSTDIR)
else() else()
set(PYTHON_INSTDIR ${nanopb_PYTHON_INSTDIR_OVERRIDE}) set(PYTHON_INSTDIR ${nanopb_PYTHON_INSTDIR_OVERRIDE})
@@ -53,6 +47,10 @@ message(STATUS "Python install dir: ${PYTHON_INSTDIR}") @@ -54,6 +47,10 @@ message(STATUS "Python install dir: ${PYTHON_INSTDIR}")
# Package nanopb generator as Python module 'nanopb' # Package nanopb generator as Python module 'nanopb'
if(nanopb_BUILD_GENERATOR) if(nanopb_BUILD_GENERATOR)
# Copy Python code files related to the generator # Copy Python code files related to the generator
@ -33,7 +34,7 @@ index 273a841..02fb40c 100644
add_custom_target(nanopb_generator ALL add_custom_target(nanopb_generator ALL
COMMAND ${CMAKE_COMMAND} -E make_directory COMMAND ${CMAKE_COMMAND} -E make_directory
${PROJECT_BINARY_DIR}/nanopb/generator/proto ${PROJECT_BINARY_DIR}/nanopb/generator/proto
@@ -82,24 +80,14 @@ if(nanopb_BUILD_GENERATOR) @@ -83,24 +80,14 @@ if(nanopb_BUILD_GENERATOR)
# Install Python module files # Install Python module files
install( install(

2
ports/nanopb/portfile.cmake
View File

@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO nanopb/nanopb REPO nanopb/nanopb
REF ${VERSION} REF ${VERSION}
SHA512 635577498dfbfb46fd64b8ec83b2a4a9b03b57c665f3c9f67d35c272810c0330b0e9011d7c0e43623e9da74d6ee3a4c1f012878e2bff7e1a7e57fb7c0857ad42 SHA512 13b395e5bd5a356119a0139a5b3cb13aa821f9077a311714b88b71bd12b9b633f4158b09b5628eda39c90e52d3b78bf51314f16bc0e15621e43b09392049a284
HEAD_REF master HEAD_REF master
PATCHES PATCHES
fix-cmakelist.patch fix-cmakelist.patch

3
ports/nanopb/vcpkg.json
View File

@ -1,7 +1,6 @@
{ {
"name": "nanopb", "name": "nanopb",
"version-semver": "0.4.8", "version-semver": "0.4.9",
"port-version": 1,
"description": "A small code-size Protocol Buffers implementation in ANSI C.", "description": "A small code-size Protocol Buffers implementation in ANSI C.",
"homepage": "https://jpa.kapsi.fi/nanopb/", "homepage": "https://jpa.kapsi.fi/nanopb/",
"license": "Zlib", "license": "Zlib",

4
versions/baseline.json
View File

@ -6193,8 +6193,8 @@
"port-version": 2 "port-version": 2
}, },
"nanopb": { "nanopb": {
"baseline": "0.4.8", "baseline": "0.4.9",
"port-version": 1 "port-version": 0
}, },
"nanoprintf": { "nanoprintf": {
"baseline": "0.3.4", "baseline": "0.3.4",

5
versions/n-/nanopb.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "1f5737c00d41a894367cab2acb6ef934043fcd8e",
"version-semver": "0.4.9",
"port-version": 0
},
{ {
"git-tree": "08dcb204cd192ab2022b8d2f1f84cf480db0fb44", "git-tree": "08dcb204cd192ab2022b8d2f1f84cf480db0fb44",
"version-semver": "0.4.8", "version-semver": "0.4.8",