Changeset 2727 in Sophya for trunk/SophyaLib/SysTools

Timestamp:

May 18, 2005, 12:26:49 PM (20 years ago)

Author:

ansari

Message:

prise en compte de la nouvelle variable d'env. SOPHYABASE ds CxxCompilerLinker - Reza 18/05/2005

File:

• trunk/SophyaLib/SysTools/cxxcmplnk.cc (modified) (2 diffs)

trunk/SophyaLib/SysTools/cxxcmplnk.cc

@@ -36 +36 @@
 
 static char * gcxx_opt = 
-"-O -Wall -Wpointer-arith -Wmissing-prototypes -Wsynth -fdollars-in-identifiers";
+"-O -fdollars-in-identifiers";
 static char * KCC_opt = 
 "-O --exceptions --rtti  --auto_instantiation --one_instantiation_per_object -D__KCC__";
@@ -116 +116 @@
   compOptions += " -c ";
 
-  string dpcbase;
+  bool fgenv1 = false;
+  bool fgenv2 = false;
   char* varenv=NULL;
+  varenv=getenv("SOPHYABASE");
+  if (varenv) {
+    fgenv1 = true;
+    string sbaserep = varenv; 
+    if (sbaserep[sbaserep.length()-1] != '/')  sbaserep += '/';
+    cppFlags += ( " -I" + sbaserep + "include/ ");
+    linkOptions += " -L" + sbaserep + "slb/";
+  }
   varenv=getenv("SOPHYABASEREP");
   if (varenv) {
-    dpcbase = varenv; 
+    fgenv2 = true;
+    string dpcbase = varenv; 
     if (dpcbase[dpcbase.length()-1] != '/')  dpcbase += '/';
     cppFlags += ( " -I" + dpcbase + "Include/ ");
     linkOptions += " -L" + dpcbase + syscomp + "ShLibs/";
-    if (fglibsophya) linkOptions += " -lsophya ";
-    if (fglibextsophya) linkOptions += " -lextsophya ";
-    if (fglibpi) linkOptions += " -lPI ";
-  }
-  linkOptions += " -lm ";
-
-  string extlib;
-  varenv=getenv("EXTLIBDIR");
-  if (varenv) {
-    extlib = varenv; 
+    char * varenvextl=getenv("EXTLIBDIR");
+    if (varenvextl) {
+    string extlib = varenvextl; 
     if (extlib[extlib.length()-1] != '/')  extlib += '/';
     cppFlags += ( " -I" + extlib +"Include/ ");
-  }
+    }
+  }
+  if (!fgenv1 && !fgenv2) 
+    cout << " CxxCompilerLinker()/Warning : SOPHYABASE not defined" << endl;
+  if (fgenv1 && fgenv2) 
+    cout << " CxxCompilerLinker()/Warning : both SOPHYABASE and SOPHYABASEREP defined" << endl;
+
+  if (fglibsophya) linkOptions += " -lsophya ";
+  if (fglibextsophya) linkOptions += " -lextsophya ";
+  if (fglibpi) linkOptions += " -lPI ";
+  linkOptions += " -lm ";
+
 
   if ( (varenv=getenv("TMPDIR")) != NULL )  {