compbench-devel

[Frederic T. <xf...@us...>]

Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29485

Modified Files:
	System.cpp 
Log Message:
CEL include paths initialized.

Index: System.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System/System.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** System.cpp	8 Mar 2007 17:08:13 -0000	1.9
--- System.cpp	13 Mar 2007 20:32:13 -0000	1.10
***************
*** 12,15 ****
--- 12,16 ----
  #include <Base/md5.h>
  #include <CEL/CEL-Function.h>
+ #include <CEL/CEL-Include.h>
  #include <Benchmark/Benchmark-DLLoader.h>
  
***************
*** 36,40 ****
  System::System(std::string _filename)
  {
!   std::string tmp;
  
    configurationFile=_filename;
--- 37,42 ----
  System::System(std::string _filename)
  {
!   std::string tmp_bm;
!   std::string tmp_cel;
  
    configurationFile=_filename;
***************
*** 45,54 ****
      cbmUI=new CBM::UI;
  
!   tmp=PREFIX;
!   tmp+="/lib";
  
!   CBM::cbmlib_paths.push_back(tmp);
    CBM::cbmlib_paths.push_back("./SupportedBenchmarks/.libs");
    CBM::cbmlib_paths.push_back("../../SupportedBenchmarks/.libs");
  }
  
--- 47,65 ----
      cbmUI=new CBM::UI;
  
!   tmp_bm=PREFIX;
!   tmp_cel=PREFIX;
  
!   tmp_bm+="/lib";
! 
!   CBM::cbmlib_paths.push_back(tmp_bm);
    CBM::cbmlib_paths.push_back("./SupportedBenchmarks/.libs");
    CBM::cbmlib_paths.push_back("../../SupportedBenchmarks/.libs");
+ 
+   tmp_cel+="/share/KB";
+   CBM::CelIncludePathAdd(tmp_cel);
+   CBM::CelIncludePathAdd("./libcompbenchmarks/share/KB");
+   CBM::CelIncludePathAdd("../libcompbenchmarks/share/KB");
+   CBM::CelIncludePathAdd("../../libcompbenchmarks/share/KB");
+   CBM::CelIncludePathAdd("../../../libcompbenchmarks/share/KB");
  }