mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 19:28:59 +08:00
[nanopb] update to 0.4.9 (#41469)
This commit is contained in:
parent
db093c93c0
commit
68304c9a0c
@ -1,12 +1,13 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 273a841..02fb40c 100644
|
||||
index 301501d..c7e8e42 100644
|
||||
--- a/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")
|
||||
|
||||
-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})
|
||||
- message(FATAL_ERROR "protoc compiler not found")
|
||||
-endif()
|
||||
@ -14,7 +15,7 @@ index 273a841..02fb40c 100644
|
||||
if(NOT DEFINED CMAKE_DEBUG_POSTFIX)
|
||||
set(CMAKE_DEBUG_POSTFIX "d")
|
||||
endif()
|
||||
@@ -43,7 +38,6 @@ endif()
|
||||
@@ -44,7 +38,6 @@ endif()
|
||||
|
||||
# Determine Python module installation path
|
||||
if (NOT nanopb_PYTHON_INSTDIR_OVERRIDE)
|
||||
@ -22,7 +23,7 @@ index 273a841..02fb40c 100644
|
||||
file(TO_CMAKE_PATH "${Python_SITELIB}" PYTHON_INSTDIR)
|
||||
else()
|
||||
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'
|
||||
if(nanopb_BUILD_GENERATOR)
|
||||
# Copy Python code files related to the generator
|
||||
@ -33,7 +34,7 @@ index 273a841..02fb40c 100644
|
||||
add_custom_target(nanopb_generator ALL
|
||||
COMMAND ${CMAKE_COMMAND} -E make_directory
|
||||
${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(
|
||||
|
@ -4,7 +4,7 @@ vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO nanopb/nanopb
|
||||
REF ${VERSION}
|
||||
SHA512 635577498dfbfb46fd64b8ec83b2a4a9b03b57c665f3c9f67d35c272810c0330b0e9011d7c0e43623e9da74d6ee3a4c1f012878e2bff7e1a7e57fb7c0857ad42
|
||||
SHA512 13b395e5bd5a356119a0139a5b3cb13aa821f9077a311714b88b71bd12b9b633f4158b09b5628eda39c90e52d3b78bf51314f16bc0e15621e43b09392049a284
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-cmakelist.patch
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "nanopb",
|
||||
"version-semver": "0.4.8",
|
||||
"port-version": 1,
|
||||
"version-semver": "0.4.9",
|
||||
"description": "A small code-size Protocol Buffers implementation in ANSI C.",
|
||||
"homepage": "https://jpa.kapsi.fi/nanopb/",
|
||||
"license": "Zlib",
|
||||
|
@ -6193,8 +6193,8 @@
|
||||
"port-version": 2
|
||||
},
|
||||
"nanopb": {
|
||||
"baseline": "0.4.8",
|
||||
"port-version": 1
|
||||
"baseline": "0.4.9",
|
||||
"port-version": 0
|
||||
},
|
||||
"nanoprintf": {
|
||||
"baseline": "0.3.4",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "1f5737c00d41a894367cab2acb6ef934043fcd8e",
|
||||
"version-semver": "0.4.9",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "08dcb204cd192ab2022b8d2f1f84cf480db0fb44",
|
||||
"version-semver": "0.4.8",
|
||||
|
Loading…
Reference in New Issue
Block a user