]> SALOME platform Git repositories - tools/sat_salome.git/commitdiff
Salome HOME
Fix OpenCV_INCLUDE_DIRS definition on windows - Othewise SAT will not generate a...
authorNabil Ghodbane <nabil.ghodbane@cea.fr>
Tue, 27 Jul 2021 11:40:12 +0000 (13:40 +0200)
committerNabil Ghodbane <nabil.ghodbane@cea.fr>
Tue, 27 Jul 2021 11:40:12 +0000 (13:40 +0200)
products/env_scripts/opencv.py

index 546660c8c30d4df114d8a02b8b572950ded64774..2492802fcf2d516eb57ba341397937394e5aa4b3 100755 (executable)
@@ -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')