You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by fg...@apache.org on 2023/11/28 16:21:56 UTC

(nifi-minifi-cpp) branch main updated (fa67674eb -> 28cee7ece)

This is an automated email from the ASF dual-hosted git repository.

fgerlits pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git


    from fa67674eb MINIFICPP-2235 Remove race condition from MiNiFi Controller Closes #1688
     new 470c266fd MINIFICPP-2260 Fix OpenCV extension build failure on macOS
     new 7a3605271 MINIFICPP-2263 Fix debug build
     new 28cee7ece MINIFICPP-2266 avoid using system versions of fmt and spdlog

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/ci.yml                                    |  4 ++--
 cmake/BundledLibcURL.cmake                                  | 13 +++++++++++--
 cmake/BundledOpenCV.cmake                                   |  4 +++-
 cmake/Spdlog.cmake                                          |  2 +-
 cmake/fmt.cmake                                             |  2 +-
 .../expression-language/tests/ExpressionLanguageTests.cpp   |  4 ++++
 win_build_vs.bat                                            |  8 +++++---
 7 files changed, 27 insertions(+), 10 deletions(-)


(nifi-minifi-cpp) 03/03: MINIFICPP-2266 avoid using system versions of fmt and spdlog

Posted by fg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

fgerlits pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git

commit 28cee7ece3fcadfc0117909c908180a6052fd35f
Author: Marton Szasz <sz...@apache.org>
AuthorDate: Wed Nov 22 14:15:09 2023 +0100

    MINIFICPP-2266 avoid using system versions of fmt and spdlog
    
    Signed-off-by: Ferenc Gerlits <fg...@gmail.com>
    This closes #1697
---
 cmake/Spdlog.cmake | 2 +-
 cmake/fmt.cmake    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/Spdlog.cmake b/cmake/Spdlog.cmake
index 578e0d812..07eb0f103 100644
--- a/cmake/Spdlog.cmake
+++ b/cmake/Spdlog.cmake
@@ -22,6 +22,6 @@ set(SPDLOG_FMT_EXTERNAL ON CACHE STRING "" FORCE)
 FetchContent_Declare(Spdlog
         URL  https://github.com/gabime/spdlog/archive/refs/tags/v1.12.0.tar.gz
         URL_HASH SHA256=4dccf2d10f410c1e2feaff89966bfc49a1abb29ef6f08246335b110e001e09a9
-        FIND_PACKAGE_ARGS
+        OVERRIDE_FIND_PACKAGE
         )
 FetchContent_MakeAvailable(Spdlog)
diff --git a/cmake/fmt.cmake b/cmake/fmt.cmake
index cbf2c66f8..fc48799ce 100644
--- a/cmake/fmt.cmake
+++ b/cmake/fmt.cmake
@@ -20,6 +20,6 @@ include(FetchContent)
 FetchContent_Declare(Fmt
         URL  https://github.com/fmtlib/fmt/archive/refs/tags/10.1.0.tar.gz
         URL_HASH SHA256=deb0a3ad2f5126658f2eefac7bf56a042488292de3d7a313526d667f3240ca0a
-        FIND_PACKAGE_ARGS
+        OVERRIDE_FIND_PACKAGE
         )
 FetchContent_MakeAvailable(Fmt)


(nifi-minifi-cpp) 02/03: MINIFICPP-2263 Fix debug build

Posted by fg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

fgerlits pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git

commit 7a3605271e901a2db1625cc9a45d55ad5fd8835e
Author: Gabor Gyimesi <ga...@gmail.com>
AuthorDate: Fri Nov 17 10:27:14 2023 +0100

    MINIFICPP-2263 Fix debug build
    
    Signed-off-by: Ferenc Gerlits <fg...@gmail.com>
    This closes #1696
---
 .github/workflows/ci.yml                                    |  2 +-
 cmake/BundledLibcURL.cmake                                  | 13 +++++++++++--
 .../expression-language/tests/ExpressionLanguageTests.cpp   |  4 ++++
 win_build_vs.bat                                            |  8 +++++---
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f1702c860..e3878c188 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -111,7 +111,7 @@ jobs:
       - name: build
         run: |
           for /f "usebackq delims=" %%i in (`vswhere.exe -latest -property installationPath`) do if exist "%%i\Common7\Tools\vsdevcmd.bat" call "%%i\Common7\Tools\vsdevcmd.bat" -arch=x64 -host_arch=x64
-          win_build_vs.bat ..\b /64 /CI /S /A /PDH /SPLUNK /GCP /ELASTIC /K /L /R /Z /N /RO /PR /PYTHON_SCRIPTING /LUA_SCRIPTING /MQTT /SCCACHE /NINJA
+          win_build_vs.bat ..\b /64 /CI /PDH /R /N /RO /SCCACHE /NINJA
           sccache --show-stats
         shell: cmd
       - name: sccache cache save
diff --git a/cmake/BundledLibcURL.cmake b/cmake/BundledLibcURL.cmake
index f17e55bc1..c21a82bd6 100644
--- a/cmake/BundledLibcURL.cmake
+++ b/cmake/BundledLibcURL.cmake
@@ -21,13 +21,22 @@ function(use_bundled_curl SOURCE_DIR BINARY_DIR)
     set(PC ${Bash_EXECUTABLE} -c "set -x && \
             (\"${Patch_EXECUTABLE}\" -p1 -R -s -f --dry-run -i \"${PATCH_FILE_1}\" || \"${Patch_EXECUTABLE}\" -p1 -N -i \"${PATCH_FILE_1}\")")
     # Define byproducts
+    string(TOLOWER "${CMAKE_BUILD_TYPE}" build_type)
     if (WIN32)
-        set(BYPRODUCT "lib/libcurl.lib")
+        if (build_type MATCHES relwithdebinfo OR build_type MATCHES release)
+            set(BYPRODUCT "lib/libcurl.lib")
+        else()
+            set(BYPRODUCT "lib/libcurl-d.lib")
+        endif()
     else()
         include(GNUInstallDirs)
         string(REPLACE "/" ";" LIBDIR_LIST ${CMAKE_INSTALL_LIBDIR})
         list(GET LIBDIR_LIST 0 LIBDIR)
-        set(BYPRODUCT "${LIBDIR}/libcurl.a")
+        if (build_type MATCHES relwithdebinfo OR build_type MATCHES release)
+            set(BYPRODUCT "${LIBDIR}/libcurl.a")
+        else()
+            set(BYPRODUCT "${LIBDIR}/libcurl-d.a")
+        endif()
     endif()
 
     # Set build options
diff --git a/extensions/expression-language/tests/ExpressionLanguageTests.cpp b/extensions/expression-language/tests/ExpressionLanguageTests.cpp
index 8992a647d..b414949c3 100644
--- a/extensions/expression-language/tests/ExpressionLanguageTests.cpp
+++ b/extensions/expression-language/tests/ExpressionLanguageTests.cpp
@@ -22,7 +22,11 @@
 #include <string>
 #ifndef DISABLE_CURL
 #ifdef WIN32
+#ifdef _DEBUG
+#pragma comment(lib, "libcurl-d.lib")
+#else
 #pragma comment(lib, "libcurl.lib")
+#endif
 #pragma comment(lib, "Ws2_32.lib")
 #pragma comment(lib, "legacy_stdio_definitions.lib")
 #pragma comment(lib, "crypt32.lib")
diff --git a/win_build_vs.bat b/win_build_vs.bat
index 35327912e..416ce2434 100755
--- a/win_build_vs.bat
+++ b/win_build_vs.bat
@@ -46,15 +46,17 @@ set enable_pcap=OFF
 set enable_python_scripting=ON
 set enable_sensors=OFF
 set enable_usb_camera=OFF
+set enable_nanofi=OFF
+set enable_opencv=OFF
+set enable_prometheus=ON
+set enable_gcp=ON
+set enable_elastic=ON
 set test_custom_wel_provider=OFF
 set generator="Visual Studio 17 2022"
 set cpack=OFF
 set installer_merge_modules=OFF
 set strict_gsl_checks=
 set redist=
-set enable_nanofi=OFF
-set enable_opencv=OFF
-set enable_prometheus=ON
 set real_odbc=OFF
 set sccache_arg=
 


(nifi-minifi-cpp) 01/03: MINIFICPP-2260 Fix OpenCV extension build failure on macOS

Posted by fg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

fgerlits pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git

commit 470c266fd8f3f5971defed1d2b42e654c16e8d38
Author: Martin Zink <ma...@apache.org>
AuthorDate: Fri Oct 27 15:18:48 2023 +0200

    MINIFICPP-2260 Fix OpenCV extension build failure on macOS
    
    also:
    - link openCV required libs in BundledOpenCV.cmake instead of opencv/CMakeLists.txt
    - replace lapack and blas with "-framework Accelerate"
    
    Signed-off-by: Ferenc Gerlits <fg...@gmail.com>
    This closes #1694
---
 .github/workflows/ci.yml  | 2 +-
 cmake/BundledOpenCV.cmake | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7c10e7083..f1702c860 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,7 +38,7 @@ jobs:
           export LDFLAGS="-L/usr/local/opt/flex/lib"
           export CPPFLAGS="-I/usr/local/opt/flex/include"
           # CPPFLAGS are not recognized by cmake, so we have to force them to CFLAGS and CXXFLAGS to have flex 2.6 working
-          ./bootstrap.sh -e -t && cd build  && cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCI_BUILD=ON -DCMAKE_C_FLAGS="${CPPFLAGS} ${CFLAGS}" -DCMAKE_CXX_FLAGS="${CPPFLAGS} ${CXXFLAGS}" -DENABLE_PYTHON_SCRIPTING=ON -DENABLE_LUA_SCRIPTING=ON -DENABLE_SQL=ON -DUSE_REAL_ODBC_TEST_DRIVER=ON -DENABLE_AZURE=ON -DENABLE_GCP=ON -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_RULE_MESSAGES=OFF -DSTRICT_GSL_CHECKS=AUDIT -DFAIL_ON_WARNINGS=ON .. && cmake --build . --parallel 4
+          ./bootstrap.sh -e -t && cd build  && cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCI_BUILD=ON -DCMAKE_C_FLAGS="${CPPFLAGS} ${CFLAGS}" -DCMAKE_CXX_FLAGS="${CPPFLAGS} ${CXXFLAGS}" -DENABLE_PYTHON_SCRIPTING=ON -DENABLE_LUA_SCRIPTING=ON -DENABLE_SQL=ON -DUSE_REAL_ODBC_TEST_DRIVER=ON -DENABLE_AZURE=ON -DENABLE_GCP=ON -DENABLE_OPENCV=ON -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_RULE_MESSAGES=OFF -DSTRICT_GSL_CHECKS=AUDIT -DFAIL_ON_WARNINGS=ON .. && cmake --build . --parallel 4
       - name: cache save
         uses: actions/cache/save@v3
         if: always()
diff --git a/cmake/BundledOpenCV.cmake b/cmake/BundledOpenCV.cmake
index ccd18ae23..7e793950f 100644
--- a/cmake/BundledOpenCV.cmake
+++ b/cmake/BundledOpenCV.cmake
@@ -210,5 +210,7 @@ function(use_bundled_opencv SOURCE_DIR BINARY_DIR)
 
     add_library(OPENCV::libopencv INTERFACE IMPORTED)
     target_link_libraries(OPENCV::libopencv INTERFACE OPENCV::libopencv-flann OPENCV::libopencv-dnn OPENCV::libopencv-objdetect OPENCV::libopencv-core OPENCV::libopencv-gapi OPENCV::libopencv-imgcodecs OPENCV::libopencv-calib3d OPENCV::libopencv-imgproc OPENCV::libopencv-photo OPENCV::libopencv-videoio OPENCV::libopencv-video OPENCV::libopencv-stitching OPENCV::libopencv-features2d)
-
+    if (APPLE)
+        target_link_libraries(OPENCV::libopencv INTERFACE "-framework AVFoundation" "-framework CoreFoundation" "-framework CoreGraphics" "-framework CoreMedia" "-framework CoreVideo" "-framework Foundation" "-framework OpenCL" "-framework Accelerate")
+    endif()
 endfunction(use_bundled_opencv)