This is an automated email from the ASF dual-hosted git repository. adebreceni pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit aeaef536497a4077ea5c003e6272894111a975bc Author: Martin Zink <[email protected]> AuthorDate: Mon Nov 21 13:00:59 2022 +0100 MINIFICPP-1964 Use URL/URL_HASH instead of GIT_REPOSITORY/GIT_TAG in FetchContentDeclare Signed-off-by: Adam Debreceni <[email protected]> This closes #1454 --- cmake/Date.cmake | 4 ++-- cmake/KubernetesClientC.cmake | 8 ++++---- extensions/expression-language/CMakeLists.txt | 4 ++-- extensions/expression-language/Parser.yy | 7 +++++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/cmake/Date.cmake b/cmake/Date.cmake index 2e52f6ee5..696f51ba4 100644 --- a/cmake/Date.cmake +++ b/cmake/Date.cmake @@ -46,8 +46,8 @@ if (WIN32) endif() FetchContent_Declare(date_src - GIT_REPOSITORY https://github.com/HowardHinnant/date.git - GIT_TAG v3.0.1 # adjust tag/branch/commit as needed + URL https://github.com/HowardHinnant/date/archive/refs/tags/v3.0.1.tar.gz + URL_HASH SHA256=7a390f200f0ccd207e8cff6757e04817c1a0aec3e327b006b7eb451c57ee3538 ) FetchContent_GetProperties(date_src) if (NOT date_src_POPULATED) diff --git a/cmake/KubernetesClientC.cmake b/cmake/KubernetesClientC.cmake index 5da6d3c5e..f97b7a811 100644 --- a/cmake/KubernetesClientC.cmake +++ b/cmake/KubernetesClientC.cmake @@ -36,8 +36,8 @@ set(WEBSOCKETS_PATCH_FILE "${CMAKE_SOURCE_DIR}/thirdparty/libwebsockets/fix-incl set(WEBSOCKETS_PC ${Bash_EXECUTABLE} -c "set -x &&\ (${Patch_EXECUTABLE} -R -p1 -s -f --dry-run -i ${WEBSOCKETS_PATCH_FILE} || ${Patch_EXECUTABLE} -p1 -i ${WEBSOCKETS_PATCH_FILE})") FetchContent_Declare(websockets - GIT_REPOSITORY https://github.com/warmcat/libwebsockets.git - GIT_TAG b0a749c8e7a8294b68581ce4feac0e55045eb00b # v4.3.2 + URL https://github.com/warmcat/libwebsockets/archive/refs/tags/v4.3.2.tar.gz + URL_HASH SHA256=6a85a1bccf25acc7e8e5383e4934c9b32a102880d1e4c37c70b27ae2a42406e1 PATCH_COMMAND "${WEBSOCKETS_PC}" ) @@ -48,8 +48,8 @@ set(K8S_PATCH_FILE "${CMAKE_SOURCE_DIR}/thirdparty/kubernetes-client-c/remove-fi set(K8S_PC ${Bash_EXECUTABLE} -c "set -x &&\ (${Patch_EXECUTABLE} -R -p1 -s -f --dry-run -i ${K8S_PATCH_FILE} || ${Patch_EXECUTABLE} -p1 -i ${K8S_PATCH_FILE})") FetchContent_Declare(kubernetes - GIT_REPOSITORY https://github.com/kubernetes-client/c - GIT_TAG f5f12a807432824963bbea380cdf4d9ba412e00e # v0.4.0 + URL https://github.com/kubernetes-client/c/archive/refs/tags/v0.5.0.tar.gz + URL_HASH SHA256=dbb6e6cd29ae2ac6c15de894aefb9b1e3d48916541d443f089aa0ffad6517ec6 PATCH_COMMAND "${K8S_PC}" ) diff --git a/extensions/expression-language/CMakeLists.txt b/extensions/expression-language/CMakeLists.txt index 55d1f9a7c..775b4116a 100644 --- a/extensions/expression-language/CMakeLists.txt +++ b/extensions/expression-language/CMakeLists.txt @@ -30,8 +30,8 @@ if(WIN32) FetchContent_Declare( winflexbison - GIT_REPOSITORY "https://github.com/lexxmark/winflexbison.git"; - GIT_TAG "a72f3d6b5102b65f064a5054ba634d3d62e94f41" + URL "https://github.com/lexxmark/winflexbison/archive/refs/tags/v2.5.25.tar.gz"; + URL_HASH "SHA256=8e1b71e037b524ba3f576babb0cf59182061df1f19cd86112f085a882560f60b" ) FetchContent_GetProperties("winflexbison") diff --git a/extensions/expression-language/Parser.yy b/extensions/expression-language/Parser.yy index df84ef895..3a1f4d67a 100644 --- a/extensions/expression-language/Parser.yy +++ b/extensions/expression-language/Parser.yy @@ -19,7 +19,7 @@ %require "3.0" %define api.namespace {org::apache::nifi::minifi::expression} -%parse-param {Driver* driver} +%parse-param {Driver* driver} %locations %define parser_class_name {Parser} @@ -34,6 +34,9 @@ #include <expression/Expression.h> #include "location.hh" + #if defined(WIN32) && defined(S_FALSE) + #undef S_FALSE // winerror.h #defines S_FALSE, which conflicts with the generated token + #endif namespace org { namespace apache { @@ -56,7 +59,7 @@ #include <expression/Expression.h> #include "Driver.h" - + #undef yylex #define yylex driver->lex }
