szaszm commented on a change in pull request #1110: URL: https://github.com/apache/nifi-minifi-cpp/pull/1110#discussion_r670490280
########## File path: cmake/BundledOpenCV.cmake ########## @@ -0,0 +1,214 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +function(use_bundled_opencv SOURCE_DIR BINARY_DIR) + set(PATCH_FILE "${SOURCE_DIR}/thirdparty/opencv/opencv.patch") + set(PC "${Patch_EXECUTABLE}" -R -p1 -s -f --dry-run -i "${PATCH_FILE}" || "${Patch_EXECUTABLE}" -p1 -i "${PATCH_FILE}") + + if (WIN32) + set(CMAKE_INSTALL_LIBDIR "lib") + else() + include(GNUInstallDirs) + endif() + + # Define byproducts + if (WIN32) + set(SUFFIX "410.lib") + set(THIRDPARTY_SUFFIX ".lib") + set(PREFIX "") + set(THIRDPARTY_DIR "") + else() + set(SUFFIX ".a") + set(THIRDPARTY_SUFFIX ".a") + set(PREFIX "lib") + set(THIRDPARTY_DIR "opencv4/3rdparty/") + endif() + + set(OPENCV_BYPRODUCT_DIR "${CMAKE_CURRENT_BINARY_DIR}/thirdparty/opencv-install") + set(BYPRODUCTS + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_flann${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_dnn${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_objdetect${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_core${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_gapi${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_imgcodecs${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_calib3d${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_imgproc${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_photo${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_videoio${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_video${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_stitching${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_features2d${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${THIRDPARTY_DIR}${PREFIX}libjpeg-turbo${THIRDPARTY_SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${THIRDPARTY_DIR}${PREFIX}libpng${THIRDPARTY_SUFFIX}") + + # Set build options + set(OPENCV_CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS} + "-DCMAKE_INSTALL_PREFIX=${OPENCV_BYPRODUCT_DIR}" + "-DBUILD_SHARED_LIBS=OFF" + "-DBUILD_WITH_STATIC_CRT=OFF" + "-DBUILD_EXAMPLES=OFF" + "-DBUILD_DOCS=OFF" + "-DBUILD_PACKAGE=OFF" + "-DBUILD_opencv_apps=OFF" + "-DBUILD_PERF_TESTS=OFF" + "-DBUILD_TESTS=OFF" + "-DBUILD_opencv_calib3d=ON" + "-DBUILD_opencv_core=ON" + "-DBUILD_opencv_dnn=ON" + "-DBUILD_opencv_features2d=ON" + "-DBUILD_opencv_flann=ON" + "-DBUILD_opencv_gapi=ON" + "-DBUILD_opencv_highgui=OFF" + "-DBUILD_opencv_imgcodecs=ON" + "-DBUILD_opencv_imgproc=ON" + "-DBUILD_opencv_ml=OFF" + "-DBUILD_opencv_objdetect=ON" + "-DBUILD_opencv_photo=ON" + "-DBUILD_opencv_stitching=ON" + "-DBUILD_opencv_video=ON" + "-DBUILD_opencv_videoio=ON" + "-DBUILD_JAVA=OFF" + "-DBUILD_FAT_JAVA_LIB=OFF" + "-DBUILD_PNG=ON" + "-DBUILD_JPEG=ON" + "-DWITH_1394=OFF" + "-DWITH_FFMPEG=OFF" + "-DWITH_GSTREAMER=OFF" + "-DWITH_GTK=OFF" + "-DWITH_IPP=OFF" + "-DWITH_JASPER=OFF" + "-DWITH_OPENEXR=OFF" + "-DWITH_ITT=OFF" + "-DWITH_OPENEXR=OFF" + "-DWITH_WEBP=OFF" + "-DWITH_TIFF=OFF") + + append_third_party_passthrough_args(OPENCV_CMAKE_ARGS "${OPENCV_CMAKE_ARGS}") + + # Build project + ExternalProject_Add( + opencv-external + GIT_REPOSITORY "https://github.com/opencv/opencv.git"; + GIT_TAG "4.1.0" + SOURCE_DIR "${BINARY_DIR}/thirdparty/opencv-src" + PATCH_COMMAND ${PC} + CMAKE_ARGS ${OPENCV_CMAKE_ARGS} + BUILD_BYPRODUCTS "${OPENCV_LIBS}" + EXCLUDE_FROM_ALL TRUE + LIST_SEPARATOR % # This is needed for passing semicolon-separated lists + ) + + # Set variables + set(OPENCV_FOUND "YES" CACHE STRING "" FORCE) + if (WIN32) + set(OPENCV_INCLUDE_DIR "${OPENCV_BYPRODUCT_DIR}/include" CACHE STRING "" FORCE) + else() + set(OPENCV_INCLUDE_DIR "${OPENCV_BYPRODUCT_DIR}/include/opencv4" CACHE STRING "" FORCE) + endif() + set(OPENCV_LIBRARIES "${OPENCV_LIBS}" CACHE STRING "" FORCE) + + # Set exported variables for FindPackage.cmake + set(PASSTHROUGH_VARIABLES ${PASSTHROUGH_VARIABLES} "-DEXPORTED_OPENCV_INCLUDE_DIR=${OPENCV_INCLUDE_DIR}" CACHE STRING "" FORCE) + string(REPLACE ";" "%" OPENCV_LIBRARIES_EXPORT "${OPENCV_LIBRARIES}") + set(PASSTHROUGH_VARIABLES ${PASSTHROUGH_VARIABLES} "-DEXPORTED_OPENCV_LIBRARIES=${OPENCV_LIBRARIES_EXPORT}" CACHE STRING "" FORCE) + message(${PASSTHROUGH_VARIABLES}) Review comment: Please make this message `DEBUG` or remove it. I don't think it helps the user who compiles the project. ########## File path: cmake/BundledOpenCV.cmake ########## @@ -0,0 +1,214 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +function(use_bundled_opencv SOURCE_DIR BINARY_DIR) + set(PATCH_FILE "${SOURCE_DIR}/thirdparty/opencv/opencv.patch") + set(PC "${Patch_EXECUTABLE}" -R -p1 -s -f --dry-run -i "${PATCH_FILE}" || "${Patch_EXECUTABLE}" -p1 -i "${PATCH_FILE}") + + if (WIN32) + set(CMAKE_INSTALL_LIBDIR "lib") + else() + include(GNUInstallDirs) + endif() + + # Define byproducts + if (WIN32) + set(SUFFIX "410.lib") + set(THIRDPARTY_SUFFIX ".lib") + set(PREFIX "") + set(THIRDPARTY_DIR "") + else() + set(SUFFIX ".a") + set(THIRDPARTY_SUFFIX ".a") + set(PREFIX "lib") + set(THIRDPARTY_DIR "opencv4/3rdparty/") + endif() + + set(OPENCV_BYPRODUCT_DIR "${CMAKE_CURRENT_BINARY_DIR}/thirdparty/opencv-install") + set(BYPRODUCTS + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_flann${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_dnn${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_objdetect${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_core${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_gapi${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_imgcodecs${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_calib3d${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_imgproc${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_photo${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_videoio${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_video${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_stitching${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${PREFIX}opencv_features2d${SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${THIRDPARTY_DIR}${PREFIX}libjpeg-turbo${THIRDPARTY_SUFFIX}" + "${OPENCV_BYPRODUCT_DIR}/${CMAKE_INSTALL_LIBDIR}/${THIRDPARTY_DIR}${PREFIX}libpng${THIRDPARTY_SUFFIX}") + + # Set build options + set(OPENCV_CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS} Review comment: Could you modify the passthrough arguments to include `-Wno-error -w` (disable warnings as errors and disable warnings altogether, only `-w` might be enough) and the msvc equivalent in CMAKE_C_FLAGS and CMAKE_CXX_FLAGS? I don't think any of us cares about warnings in opencv, or in any third party lib, yet we spam the build output with them. Not strictly related to this changeset, so it's fine to not do it here if you prefer that way. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
