From a9dfbc92bf55d3cba3359d137f06ee0d7423833f Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Wed, 2 Jun 2021 09:28:47 +0200 Subject: [PATCH] fix opencv compilation with CMake 3.17 --- applications/SALOME-9.7.0-MPI.pyconf | 4 ++++ .../opencv-3.2.0-python2-cmake-3.17.5.patch | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 products/patches/opencv-3.2.0-python2-cmake-3.17.5.patch diff --git a/applications/SALOME-9.7.0-MPI.pyconf b/applications/SALOME-9.7.0-MPI.pyconf index 5fab72c..b4a76fd 100644 --- a/applications/SALOME-9.7.0-MPI.pyconf +++ b/applications/SALOME-9.7.0-MPI.pyconf @@ -179,5 +179,9 @@ APPLICATION : } __overwrite__ : [ + { + # with cmake 3.17.5 issue with Python2 detection - remove it since not required + 'PRODUCTS.opencv.version_3_2_0.patches' : ['opencv-3.2.0-ccache.patch','opencv-3.2.0-python2-cmake-3.17.5.patch'] + } ] diff --git a/products/patches/opencv-3.2.0-python2-cmake-3.17.5.patch b/products/patches/opencv-3.2.0-python2-cmake-3.17.5.patch new file mode 100644 index 0000000..e67a7f2 --- /dev/null +++ b/products/patches/opencv-3.2.0-python2-cmake-3.17.5.patch @@ -0,0 +1,18 @@ +diff -Naur opencv-3.2.0_ref/cmake/OpenCVDetectPython.cmake opencv-3.2.0_new/cmake/OpenCVDetectPython.cmake +--- opencv-3.2.0_ref/cmake/OpenCVDetectPython.cmake 2019-07-16 15:47:28.000000000 +0200 ++++ opencv-3.2.0_new/cmake/OpenCVDetectPython.cmake 2021-06-02 09:20:21.956927178 +0200 +@@ -222,13 +222,7 @@ + endif() + endfunction(find_python) + +-find_python(2.7 "${MIN_VER_PYTHON2}" PYTHON2_LIBRARY PYTHON2_INCLUDE_DIR +- PYTHON2INTERP_FOUND PYTHON2_EXECUTABLE PYTHON2_VERSION_STRING +- PYTHON2_VERSION_MAJOR PYTHON2_VERSION_MINOR PYTHON2LIBS_FOUND +- PYTHON2LIBS_VERSION_STRING PYTHON2_LIBRARIES PYTHON2_LIBRARY +- PYTHON2_DEBUG_LIBRARIES PYTHON2_LIBRARY_DEBUG PYTHON2_INCLUDE_PATH +- PYTHON2_INCLUDE_DIR PYTHON2_INCLUDE_DIR2 PYTHON2_PACKAGES_PATH +- PYTHON2_NUMPY_INCLUDE_DIRS PYTHON2_NUMPY_VERSION) ++SET(PYTHON2INTERP_FOUND FALSE) + + find_python(3.4 "${MIN_VER_PYTHON3}" PYTHON3_LIBRARY PYTHON3_INCLUDE_DIR + PYTHON3INTERP_FOUND PYTHON3_EXECUTABLE PYTHON3_VERSION_STRING -- 2.39.2