From a6cfe9b29c871ff1830dd81ba0dc6fb623e9d1a9 Mon Sep 17 00:00:00 2001 From: dbv Date: Fri, 28 Dec 2012 18:46:36 +0400 Subject: [PATCH] 0023657: Fails compilation with WOK after patch 22980 Key -I added to CSF_TCL_INCLUDE variable --- src/Draw/Draw_CMPLRS.edl | 4 ++-- src/QABugs/QABugs_CMPLRS.edl | 6 +++--- src/QADraw/QADraw_CMPLRS.edl | 5 ++--- src/QAViewer2dTest/QAViewer2dTest_CMPLRS.edl | 2 +- src/Standard/Standard_CMPLRS.edl | 2 +- src/Viewer2dTest/Viewer2dTest_CMPLRS.edl | 2 +- src/ViewerTest/ViewerTest_CMPLRS.edl | 2 +- 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/Draw/Draw_CMPLRS.edl b/src/Draw/Draw_CMPLRS.edl index 735c86d45d..eec527d56f 100755 --- 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 07a0fb3d23..187de0f710 100755 --- 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 6c14231930..6e7b53f07a 100755 --- 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 93ad0e67d3..5ad52476c5 100755 --- 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 c29f682b94..c2f44fb6cc 100755 --- 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 942fbfcf88..a962f5ff61 100755 --- 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 8a3a311ae8..232f6a4e34 100755 --- 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;