Merge branch 'master' into spns/32239

[tools/sat_salome.git] / products / compil_scripts / opencv.sh

diff --git a/products/compil_scripts/opencv.sh b/products/compil_scripts/opencv.sh
index 7a6e3082569bc13174a7348ce8c7797d828c6e9d..94a0f45593f73f1c8e926be2c5fe7ac64c6e0576 100755 (executable)
--- a/products/compil_scripts/opencv.sh
+++ b/products/compil_scripts/opencv.sh
@@ -19,6 +19,12 @@ if version_ge $VERSION "3."; then
     CMAKE_OPTIONS+=" -DBUILD_opencv_java:BOOL=OFF"
     CMAKE_OPTIONS+=" -DPYTHON_INCLUDE_DIR=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}"
     CMAKE_OPTIONS+=" -DPYTHON_INCLUDE_DIR2=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}"
+    if [ "${SAT_Python_IS_NATIVE}" != "1" ]
+    then
+       CMAKE_OPTIONS+=" -DPython3_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}"
+       CMAKE_OPTIONS+=" -DPython3_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/libpython${PYTHON_VERSION}.so"
+       CMAKE_OPTIONS+=" -DPython3_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python${PYTHON_VERSION}"
+    fi
     CMAKE_OPTIONS+=" -DWITH_FFMPEG:BOOL=OFF"
     CMAKE_OPTIONS+=" -DWITH_LAPACK:BOOL=OFF"
     CMAKE_OPTIONS+=" -DWITH_CUDA:BOOL=OFF"
@@ -27,7 +33,6 @@ if version_ge $VERSION "3."; then
     CMAKE_OPTIONS+=" -DENABLE_PRECOMPILED_HEADERS:BOOL=OFF"
     CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS=-fPIC"
     CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS=-fPIC"
-    LINUX_DIST="$DIST_NAME$DIST_VERSION"
     LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION"
     case $LINUX_DISTRIBUTION in
       FD34|FD35|FD36|UB22*)
@@ -41,7 +46,6 @@ else
     echo "*** openCV version $VERSION < 3."
     CMAKE_OPTIONS+=" -DWITH_CUDA:BOOL=OFF"
     CMAKE_OPTIONS+=" -DWITH_FFMPEG:BOOL=OFF"
-    # OP opencv on Ubuntu
     CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python"
     CMAKE_OPTIONS+=" -DPYTHON_INCLUDE_DIRS=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}"
     CMAKE_OPTIONS+=" -DPYTHON_LIBRARY=${PYTHON_ROOT_DIR}/lib/libpython${PYTHON_VERSION}.so"