From: dbv <dbv@opencascade.com>
Date: Fri, 21 Dec 2012 13:08:08 +0000 (+0300)
Subject: 0023657: Fails compilation with WOK after patch 22980
X-Git-Tag: V6_7_1~81
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=c5ebe32bdb384bb48a93c2cf12dcd92f238c4714;p=occt-wok.git

0023657: Fails compilation with WOK after patch 22980

Added key -I to CSF_TCL_INCLUDE variable
---

diff --git a/src/WOKBuilderDef/CSF.edl b/src/WOKBuilderDef/CSF.edl
index 3df0925..314e23c 100755
--- a/src/WOKBuilderDef/CSF.edl
+++ b/src/WOKBuilderDef/CSF.edl
@@ -56,8 +56,7 @@
   @string %CSF_CXX_INCLUDE = "";
 
   @set %CSF_TCL_HOME = "";
-  -- workaround against dummy code in WOKSH_CMPLRS.edl that append -I%CSF_TCL_INCLUDE
-  @set %CSF_TCL_INCLUDE = ": ";
+  @set %CSF_TCL_INCLUDE = "";
   @set %CSF_JAVA_INCLUDE = "";
 
   @set %CSF_X11_INCLUDE = "";
diff --git a/src/WOKBuilderDef/CSF_AIX.edl b/src/WOKBuilderDef/CSF_AIX.edl
index 0a323cc..5592e4d 100644
--- a/src/WOKBuilderDef/CSF_AIX.edl
+++ b/src/WOKBuilderDef/CSF_AIX.edl
@@ -26,7 +26,7 @@
   @set %CSF_SOCKETLibs = " ";
 
   @set %CSF_TCL_HOME = "/missing/missing ";
-  @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include ";
+  @string %CSF_TCL_INCLUDE = "-I" %CSF_TCL_HOME "/include ";
 
   @set %CSF_ThreadLibs = "-lpthread";
 
diff --git a/src/WOKBuilderDef/CSF_AO1.edl b/src/WOKBuilderDef/CSF_AO1.edl
index c759666..48edae9 100644
--- a/src/WOKBuilderDef/CSF_AO1.edl
+++ b/src/WOKBuilderDef/CSF_AO1.edl
@@ -31,7 +31,7 @@
   @set %CSF_C_Options    = "-DDECOSF1 -O3 -DOCC_CONVERT_SIGNALS";
 
   @set %CSF_TCL_HOME = "/usr/tcltk";
-  @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include/itcl ";
+  @string %CSF_TCL_INCLUDE = "-I" %CSF_TCL_HOME "/include/itcl ";
 
   @string %CSF_JavaHome     = "/PRODUCTS/java/j2sdk1_3_1";
   @string %CSF_JAVA_INCLUDE = "-I" %CSF_JavaHome "/include -I" %CSF_JavaHome "/include/solaris ";
diff --git a/src/WOKBuilderDef/CSF_BSD.edl b/src/WOKBuilderDef/CSF_BSD.edl
index 9ebbdf1..1d0d2e7 100644
--- a/src/WOKBuilderDef/CSF_BSD.edl
+++ b/src/WOKBuilderDef/CSF_BSD.edl
@@ -53,7 +53,7 @@
   @set %CSF_TCL_HOME = "/usr/local";
   -->> END TODO
 
-  @string %CSF_TCL_INCLUDE = "/usr/local/include/tcl8.4 ";
+  @string %CSF_TCL_INCLUDE = "-I/usr/local/include/tcl8.4 ";
 
   --<< TODO : If applicable , modify the root location where Java is installed.
   @set %CSF_JavaHome        = "/usr/local/diablo-jdk1.5.0";
diff --git a/src/WOKBuilderDef/CSF_HP.edl b/src/WOKBuilderDef/CSF_HP.edl
index 8460308..86fa960 100644
--- a/src/WOKBuilderDef/CSF_HP.edl
+++ b/src/WOKBuilderDef/CSF_HP.edl
@@ -26,7 +26,7 @@
   @set %CSF_C_Options = " -DHPUX ";
 
   @set %CSF_TCL_HOME = "/missing/missing ";
-  @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include ";
+  @string %CSF_TCL_INCLUDE = "-I" %CSF_TCL_HOME "/include ";
 
   @set %CSF_X11_INCLUDE    = "-I/usr/include/X11R6 ";
   @set %CSF_XMU_INCLUDE    = "-I/usr/contrib/X11R6/include ";
diff --git a/src/WOKBuilderDef/CSF_LIN.edl b/src/WOKBuilderDef/CSF_LIN.edl
index c62b500..73e5a98 100644
--- a/src/WOKBuilderDef/CSF_LIN.edl
+++ b/src/WOKBuilderDef/CSF_LIN.edl
@@ -65,7 +65,7 @@
 
   -- Tcl/Tk configuration
   @if (%CSF_TCL_HOME != "") then
-    @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include ";
+    @string %CSF_TCL_INCLUDE = "-I" %CSF_TCL_HOME "/include ";
     @string %CSF_TclLibs   = "-L" %CSF_TCL_HOME "/lib -ltcl8.5 ";
     @string %CSF_TclTkLibs = "-L" %CSF_TCL_HOME "/lib -ltk8.5 -L" %X11_LIB " -lX11 ";
   @else
diff --git a/src/WOKBuilderDef/CSF_MAC.edl b/src/WOKBuilderDef/CSF_MAC.edl
index b286e20..41f2f2f 100644
--- a/src/WOKBuilderDef/CSF_MAC.edl
+++ b/src/WOKBuilderDef/CSF_MAC.edl
@@ -77,7 +77,7 @@
 
   -- Tcl/Tk configuration
   @if (%CSF_TCL_HOME != "") then
-    @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include ";
+    @string %CSF_TCL_INCLUDE = "-I" %CSF_TCL_HOME "/include ";
     @string %CSF_TclLibs   = "-L" %CSF_TCL_HOME "/lib -ltcl8.5 ";
     @string %CSF_TclTkLibs = "-L" %X11_LIB " -lX11 -L" %CSF_TCL_HOME "/lib -ltk8.5 ";
   @else
diff --git a/src/WOKBuilderDef/CSF_SIL.edl b/src/WOKBuilderDef/CSF_SIL.edl
index 6030ccb..011e0cf 100644
--- a/src/WOKBuilderDef/CSF_SIL.edl
+++ b/src/WOKBuilderDef/CSF_SIL.edl
@@ -48,7 +48,7 @@
   @set %CSF_pthread = "-lpthread";
 
   @set %CSF_TCL_HOME = "/usr/tcltk.64";
-  @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include/itcl ";
+  @string %CSF_TCL_INCLUDE = "-I" %CSF_TCL_HOME "/include/itcl ";
 
   @set %CSF_X11_INCLUDE_EXTENSION = " -I/usr/include/X11/extensions ";
 
diff --git a/src/WOKBuilderDef/CSF_SUN.edl b/src/WOKBuilderDef/CSF_SUN.edl
index f162dcc..e39079b 100644
--- a/src/WOKBuilderDef/CSF_SUN.edl
+++ b/src/WOKBuilderDef/CSF_SUN.edl
@@ -74,7 +74,7 @@
   @set %CSF_TCL_HOME = "/PRODUCTS/tcltk-84";
   -->> END TODO
 
-  @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include -DUSE_NON_CONST ";
+  @string %CSF_TCL_INCLUDE = "-I" %CSF_TCL_HOME "/include -DUSE_NON_CONST ";
   @string %CSF_TclLibs     = "-L" %CSF_TCL_HOME "/lib -R" %CSF_TCL_HOME "/lib -ltcl8.4 ";
   @string %CSF_TclTkLibs   = "-L" %CSF_TCL_HOME "/lib -R" %CSF_TCL_HOME "/lib -ltk8.4 ";
 
diff --git a/src/WOKLibs/WOKLibs_CMPLRS.edl b/src/WOKLibs/WOKLibs_CMPLRS.edl
index 56c1a00..36fe634 100755
--- a/src/WOKLibs/WOKLibs_CMPLRS.edl
+++ b/src/WOKLibs/WOKLibs_CMPLRS.edl
@@ -8,7 +8,7 @@
 
  @uses "CSF.edl";
 
- @string %CMPLRS_CXX_Options = " -I"%CSF_TCL_INCLUDE %CMPLRS_CXX_Options ;
+ @string %CMPLRS_CXX_Options += " " %CSF_TCL_INCLUDE;
 @if ( %Station == "wnt" ) then
 	@string %CMPLRS_ExportBehaviour = " -D__" %Entity "_DLL";
 @endif;
diff --git a/src/WOKSH/WOKSH_CMPLRS.edl b/src/WOKSH/WOKSH_CMPLRS.edl
index adf7ba4..3ca71a3 100755
--- a/src/WOKSH/WOKSH_CMPLRS.edl
+++ b/src/WOKSH/WOKSH_CMPLRS.edl
@@ -8,6 +8,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/WOKTCL/WOKTCL_CMPLRS.edl b/src/WOKTCL/WOKTCL_CMPLRS.edl
index 1156529..7d1a1e8 100755
--- a/src/WOKTCL/WOKTCL_CMPLRS.edl
+++ b/src/WOKTCL/WOKTCL_CMPLRS.edl
@@ -8,6 +8,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/WOKTclLib/OS.tcl b/src/WOKTclLib/OS.tcl
index 6c448c1..08c50ce 100644
--- a/src/WOKTclLib/OS.tcl
+++ b/src/WOKTclLib/OS.tcl
@@ -2442,7 +2442,7 @@ proc OS:edcomp { plat lhdr comp {except {}} {incstr <incDirectories>} {tcstr ""}
 		    set TCLINC "[lindex [wokparam -v %CSF_TCL_INCLUDE] 0]"
 		    if { "$new " == $CXXINC} {
 			append str "-I\${COMPINCLUDE} "
-		    } elseif  {"$new " == $TCLINC} {
+		    } elseif  {"-I$new " == $TCLINC} {
 			append str "-I\${TCLHOME}/include "
 		    } elseif  {"$tok " == "[lindex [wokparam -v %CSF_X11_INCLUDE] 0]"} {
 			#puts "X11 was captured"
diff --git a/src/WOKTclTools/WOKTclTools_CMPLRS.edl b/src/WOKTclTools/WOKTclTools_CMPLRS.edl
index 7a709de..0e96544 100755
--- a/src/WOKTclTools/WOKTclTools_CMPLRS.edl
+++ b/src/WOKTclTools/WOKTclTools_CMPLRS.edl
@@ -8,6 +8,6 @@
 
  @uses "CSF.edl";
 
- @string %CMPLRS_CXX_Options = " -I"%CSF_TCL_INCLUDE %CMPLRS_CXX_Options ;
+ @string %CMPLRS_CXX_Options += " " %CSF_TCL_INCLUDE;
 
 @endif;