0023657: Fails compilation with WOK after patch 22980

Key -I added to CSF_TCL_INCLUDE variable

diff --git a/src/Draw/Draw_CMPLRS.edl b/src/Draw/Draw_CMPLRS.edl
index 735c86d45df5200a379cbd30ef52310910ba613b..eec527d56f8f197665d4c0d41368e5781a90ba60 100755 (executable)
--- a/src/Draw/Draw_CMPLRS.edl
+++ b/src/Draw/Draw_CMPLRS.edl
@@ -20,5 +20,5 @@
 @uses "CSF.edl";
 
 ---@string %CMPLRS_CXX_Options += " -I"%CSF_TCL_INCLUDE" -DUSE_TK";
-@string %CMPLRS_CXX_Options += " -I"%CSF_TCL_INCLUDE" -I"%CSF_TBB_INCLUDES ;
-
+@string %CMPLRS_CXX_Options += " " %CSF_TCL_INCLUDE;
+@string %CMPLRS_CXX_Options += " " %CSF_TBB_INCLUDES;

diff --git a/src/QABugs/QABugs_CMPLRS.edl b/src/QABugs/QABugs_CMPLRS.edl
index 07a0fb3d2340b1d3e74bf0fac1bf83177c22d244..187de0f710d750a13d164c58301c9ded204f8ec8 100755 (executable)
--- a/src/QABugs/QABugs_CMPLRS.edl
+++ b/src/QABugs/QABugs_CMPLRS.edl
@@ -22,8 +22,8 @@
 @set %QACADCAM_CMPLRS_EDL = "";
 
 @uses "CSF.edl";
-@ifdefined( %CSF_TCL_INCLUDE ) then
-@string %CMPLRS_CXX_Options = " -I"%CSF_TCL_INCLUDE" -I"%CSF_TBB_INCLUDES %CMPLRS_CXX_Options ;
-@endif;
+
+@string %CMPLRS_CXX_Options += " " %CSF_TCL_INCLUDE;
+@string %CMPLRS_CXX_Options += " " %CSF_TBB_INCLUDES;
 
 @endif;

diff --git a/src/QADraw/QADraw_CMPLRS.edl b/src/QADraw/QADraw_CMPLRS.edl
index 6c14231930891d58f89223992a544ba839ef44ec..6e7b53f07aaf6199b06d499758dd610edddbac77 100755 (executable)
--- a/src/QADraw/QADraw_CMPLRS.edl
+++ b/src/QADraw/QADraw_CMPLRS.edl
@@ -22,8 +22,7 @@
 @set %QADraw_CMPLRS_EDL = "";
 
 @uses "CSF.edl";
-@ifdefined( %CSF_TCL_INCLUDE ) then
-@string %CMPLRS_CXX_Options = " -I"%CSF_TCL_INCLUDE %CMPLRS_CXX_Options ;
-@endif;
+
+@string %CMPLRS_CXX_Options += " " %CSF_TCL_INCLUDE;
 
 @endif;

diff --git a/src/QAViewer2dTest/QAViewer2dTest_CMPLRS.edl b/src/QAViewer2dTest/QAViewer2dTest_CMPLRS.edl
index 93ad0e67d3343bbbda59df54daaf21a501a45759..5ad52476c551527da3ad050a587baa76aaa7e808 100755 (executable)
--- a/src/QAViewer2dTest/QAViewer2dTest_CMPLRS.edl
+++ b/src/QAViewer2dTest/QAViewer2dTest_CMPLRS.edl
@@ -20,6 +20,6 @@
 
   @uses "CSF.edl" ;
 
-  @string %CMPLRS_CXX_Options = " -I"%CSF_TCL_INCLUDE  %CMPLRS_CXX_Options ;
+  @string %CMPLRS_CXX_Options += " " %CSF_TCL_INCLUDE;
 
 @endif;

diff --git a/src/Standard/Standard_CMPLRS.edl b/src/Standard/Standard_CMPLRS.edl
index c29f682b94caf4e3d7e693edcd39e4a9e17b3a26..c2f44fb6ccd597ce9948dd35a014815aa9cadfc0 100755 (executable)
--- a/src/Standard/Standard_CMPLRS.edl
+++ b/src/Standard/Standard_CMPLRS.edl
@@ -21,7 +21,7 @@
 @set %Standard_CMPLRS_EDL="";
 
 @if ( %Station != "sun" ) then
-  @string %CMPLRS_CXX_INCLUDE = " -I"%CMPLRS_CXX_INCLUDE" -I"%CSF_TBB_INCLUDES ;
+  @string %CMPLRS_CXX_INCLUDE += " " %CSF_TBB_INCLUDES;
 @endif;
 
 @endif;

diff --git a/src/Viewer2dTest/Viewer2dTest_CMPLRS.edl b/src/Viewer2dTest/Viewer2dTest_CMPLRS.edl
index 942fbfcf882c63efc7b94231ff57954adde2aa13..a962f5ff614042a78a80cc75f812a9bede04c72b 100755 (executable)
--- a/src/Viewer2dTest/Viewer2dTest_CMPLRS.edl
+++ b/src/Viewer2dTest/Viewer2dTest_CMPLRS.edl
@@ -20,6 +20,6 @@
 
   @uses "CSF.edl" ;
 
-  @string %CMPLRS_CXX_Options = " -I"%CSF_TCL_INCLUDE  %CMPLRS_CXX_Options ;
+  @string %CMPLRS_CXX_Options += " " %CSF_TCL_INCLUDE;
 
 @endif;

diff --git a/src/ViewerTest/ViewerTest_CMPLRS.edl b/src/ViewerTest/ViewerTest_CMPLRS.edl
index 8a3a311ae8ca8b0861eaa2c29ffe6cea52a32e4c..232f6a4e342c246c6c11bfda4a9c0cbf11d7de61 100755 (executable)
--- a/src/ViewerTest/ViewerTest_CMPLRS.edl
+++ b/src/ViewerTest/ViewerTest_CMPLRS.edl
@@ -21,6 +21,6 @@
 
   @uses "CSF.edl" ;
 
-  @string %CMPLRS_CXX_Options = " -I"%CSF_TCL_INCLUDE  %CMPLRS_CXX_Options ;
+  @string %CMPLRS_CXX_Options += " " %CSF_TCL_INCLUDE;
 
 @endif;