From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Marian Cichy Date: Tue, 7 Jan 2020 12:38:23 +0100 Message-Id: <20200107113823.4869-4-m.cichy@pengutronix.de> In-Reply-To: <20200107113823.4869-1-m.cichy@pengutronix.de> References: <20200107113823.4869-1-m.cichy@pengutronix.de> MIME-Version: 1.0 Subject: [ptxdist] [PATCH 4/4] changed and removed various cmake-flags List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Cc: Marian Cichy various flags are not specified anymore or automatically set by Cmake, i.e. any *-NOTFOUND or *-FOUND flag is autoset any paths to external program(libraries) like LAPACK or Python are auto-detected platform/hardware-support like NEON or VFPV3 are auto-detected we may want to have OPENCV_GENERATE_PKGCONFIG=ON libopencv_legacy and libopencv_shape do not exist anymore --- rules/opencv.make | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/rules/opencv.make b/rules/opencv.make index 531b3bbf4..0a6fd7a12 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -37,9 +37,6 @@ OPENCV_CONF_TOOL := cmake OPENCV_CONF_OPT := \ $(CROSS_CMAKE_USR) \ -DANT_EXECUTABLE:FILEPATH= \ - -DAtlas_BLAS_LIBRARY=Atlas_BLAS_LIBRARY-NOTFOUND \ - -DAtlas_CBLAS_LIBRARY=Atlas_CBLAS_LIBRARY-NOTFOUND \ - -DAtlas_LAPACK_LIBRARY=Atlas_LAPACK_LIBRARY-NOTFOUND \ -DBUILD_CUDA_STUBS:BOOL=OFF \ -DBUILD_DOCS:BOOL=OFF \ -DBUILD_EXAMPLES:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_EXAMPLES) \ @@ -84,10 +81,7 @@ OPENCV_CONF_OPT := \ -DBUILD_opencv_videoio=ON \ -DBUILD_opencv_world:BOOL=OFF \ -DCAROTENE_NS=carotene_o4t \ - -DCMAKE_CONFIGURATION_TYPES="Debug;Release" \ -DCPU_BASELINE=DETECT \ - -DCPU_BASELINE_DISABLE=";VFPV3" \ - -DCPU_BASELINE_REQUIRE=";NEON" \ -DCPU_DISPATCH= \ -DCV_DISABLE_OPTIMIZATION=OFF \ -DCV_ENABLE_INTRINSICS=ON \ @@ -108,21 +102,14 @@ OPENCV_CONF_OPT := \ -DENABLE_PROFILING=OFF \ -DENABLE_SOLUTION_FOLDERS=OFF \ -DENABLE_VFPV3:BOOL=OFF \ - -DEXECUTABLE_OUTPUT_PATH=$(OPENCV_BUILD_DIR)/bin \ -DGENERATE_ABI_DESCRIPTOR=OFF \ -DINSTALL_CREATE_DISTRIB:BOOL=OFF \ -DINSTALL_C_EXAMPLES:BOOL=OFF \ -DINSTALL_PYTHON_EXAMPLES:BOOL=OFF \ -DINSTALL_TESTS=OFF \ -DINSTALL_TO_MANGLED_PATHS:BOOL=OFF \ - -DLAPACK_CBLAS_H= \ - -DLAPACK_IMPL=Unknown \ - -DLAPACK_LAPACKE_H= \ - -DLAPACK_LIBRARIES= \ - -DMKL_INCLUDE_DIRS=MKL_ROOT_DIR-NOTFOUND/include \ -DMKL_WITH_OPENMP=OFF \ -DMKL_WITH_TBB=OFF \ - -DOPENCL_FOUND=ON \ -DOPENCV_DOWNLOAD_PATH=$(OPENCV_DIR)/.cache \ -DOPENCV_DUMP_HOOKS_FLOW=OFF \ -DOPENCV_ENABLE_MEMALIGN=ON \ @@ -130,24 +117,11 @@ OPENCV_CONF_OPT := \ -DOPENCV_ENABLE_NONFREE=OFF \ -DOPENCV_EXTRA_MODULES_PATH:PATH= \ -DOPENCV_FORCE_3RDPARTY_BUILD=OFF \ - -DOPENCV_GENERATE_PKGCONFIG=OFF \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ -DOPENCV_GENERATE_SETUPVARS=ON \ - -DOPENCV_MATHJAX_RELPATH=https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0 \ -DOPENCV_PYTHON3_VERSION=OFF \ -DOPENCV_WARNINGS_ARE_ERRORS:BOOL=OFF \ -DPROTOBUF_UPDATE_FILES=OFF \ - -DPYTHON2_EXECUTABLE= \ - -DPYTHON2_INCLUDE_DIR2= \ - -DPYTHON2_LIBRARY= \ - -DPYTHON2_LIBRARY_DEBUG= \ - -DPYTHON2_NUMPY_INCLUDE_DIRS= \ - -DPYTHON2_PACKAGES_PATH= \ - -DPYTHON3_EXECUTABLE=/usr/bin/python3 \ - -DPYTHON3_INCLUDE_DIR2= \ - -DPYTHON3_LIBRARY= \ - -DPYTHON3_LIBRARY_DEBUG= \ - -DPYTHON3_NUMPY_INCLUDE_DIRS= \ - -DPYTHON3_PACKAGES_PATH=lib/python3.7/dist-packages \ -DWITH_1394:BOOL=OFF \ -DWITH_ADE=ON \ -DWITH_ARAVIS=OFF \ @@ -231,12 +205,10 @@ OPENCV_LIBS-$(PTXCONF_OPENCV_FLANN) += libopencv_flann OPENCV_LIBS-$(PTXCONF_OPENCV_HIGHGUI) += libopencv_highgui OPENCV_LIBS-$(PTXCONF_OPENCV_IMGCODECS) += libopencv_imgcodecs OPENCV_LIBS-$(PTXCONF_OPENCV_IMGPROC) += libopencv_imgproc -OPENCV_LIBS-$(PTXCONF_OPENCV_LEGACY) += libopencv_legacy OPENCV_LIBS-$(PTXCONF_OPENCV_ML) += libopencv_ml OPENCV_LIBS-$(PTXCONF_OPENCV_OBJDETECT) += libopencv_objdetect OPENCV_LIBS-$(PTXCONF_OPENCV_PHOTO) += libopencv_photo OPENCV_LIBS-$(PTXCONF_OPENCV_STITCHING) += libopencv_stitching -OPENCV_LIBS-$(PTXCONF_OPENCV_SHAPE) += libopencv_shape OPENCV_LIBS-$(PTXCONF_OPENCV_VIDEO) += libopencv_video OPENCV_LIBS-$(PTXCONF_OPENCV_VIDEOIO) += libopencv_videoio -- 2.20.1 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de