From: Nabil Ghodbane Date: Tue, 27 Jul 2021 11:40:12 +0000 (+0200) Subject: Fix OpenCV_INCLUDE_DIRS definition on windows - Othewise SAT will not generate a... X-Git-Tag: V9_8_0~116 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ca690456fcd35ccbf31ff5b0a6b9788768762d16;p=tools%2Fsat_salome.git Fix OpenCV_INCLUDE_DIRS definition on windows - Othewise SAT will not generate a consistent definition for OpenCV_INCLUDE_DIRS --- diff --git a/products/env_scripts/opencv.py b/products/env_scripts/opencv.py index 546660c..2492802 100755 --- a/products/env_scripts/opencv.py +++ b/products/env_scripts/opencv.py @@ -17,7 +17,9 @@ def set_env(env, prereq_dir, version): else: env.prepend('PATH', os.path.join(prereq_dir, 'x64','vc15','bin')) env.prepend('PATH', os.path.join(prereq_dir, 'x64','vc15','lib')) - env.set('OpenCV_INCLUDE_DIRS', os.path.join(prereq_dir, 'include') + ';' + os.path.join(prereq_dir, 'include','opencv') + ';' + os.path.join(prereq_dir, 'include','opencv2')) + env.set('OpenCV_INCLUDE_DIRS', os.path.join(prereq_dir, 'include')) + env.append('OpenCV_INCLUDE_DIRS',os.path.join(prereq_dir, 'include','opencv')) + env.append('OpenCV_INCLUDE_DIRS',os.path.join(prereq_dir, 'include','opencv2')) def set_nativ_env(env): env.set('OPENCV_ROOT_DIR', '/usr')