Salome HOME
projects
/
tools
/
sat_salome.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spns #29880 : UB22.04 support: opencv - omniORB
[tools/sat_salome.git]
/
products
/
compil_scripts
/
opencv.sh
diff --git
a/products/compil_scripts/opencv.sh
b/products/compil_scripts/opencv.sh
index 237bfc4e6827fea8af51d5914b974e575e9c3a74..2663e1962e9a025ef469bb3d2d8be962bc078c54 100755
(executable)
--- a/
products/compil_scripts/opencv.sh
+++ b/
products/compil_scripts/opencv.sh
@@
-5,7
+5,7
@@
echo "opencv" $VERSION
echo "##########################################################################"
function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
echo "##########################################################################"
function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
-
+CPPSTD="\"-std=c++14\""
CMAKE_OPTIONS=""
CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
CMAKE_OPTIONS=""
CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
@@
-29,6
+29,14
@@
if version_ge $VERSION "3."; then
CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS=-fPIC"
CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS=-fPIC"
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*)
+ CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS=${CPPSTD}"
+ ;;
+ esac
+ CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS=-fPIC"
#
else
echo "*** openCV version $VERSION < 3."
#
else
echo "*** openCV version $VERSION < 3."
@@
-46,6
+54,7
@@
rm -rf $BUILD_DIR
mkdir -p $BUILD_DIR
cd $BUILD_DIR
mkdir -p $BUILD_DIR
cd $BUILD_DIR
+echo "*** cmake $CMAKE_OPTIONS $SOURCE_DIR"
cmake $CMAKE_OPTIONS $SOURCE_DIR
if [ $? -ne 0 ]
cmake $CMAKE_OPTIONS $SOURCE_DIR
if [ $? -ne 0 ]