Changeset 17307


Ignore:
Timestamp:
Oct 22, 2013, 9:11:13 PM (6 years ago)
Author:
tbretz
Message:
Added wrappers for some defines to the MARS namespace to make that available in rootlogon to pipe that through AcLiC as define to ofits.h
Location:
trunk/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/macros/rootlogon.C

    r15269 r17307  
    108108void rootlogon()
    109109{
     110    // This is a workaround to make axis behave as they
     111    // are UTC and not local time
     112    //    gSystem->Setenv("TZ", "UTC");
     113
    110114    cout << endl;
    111115
     
    184188    TString lib(gSystem->GetLinkedLibs());
    185189
    186     opt += " -D__MARS__ -DHAVE_ZLIB";
    187     opt += " -std=c++0x ";
    188 
    189     dbg += " -D__MARS__ -DHAVE_ZLIB";
    190     dbg += " -std=c++0x ";
     190    TString add = " -std=c++0x";
     191    add += " -D__MARS__";
     192    add += " -DHAVE_ZLIB";
     193    add += " -DPACKAGE_NAME='\""+MARS::GetPackageName()+"\"'";
     194    add += " -DPACKAGE_VERSION='\""+MARS::GetPackageName()+"\"'";
     195    add += " -DREVISION='\""+MARS::GetRevision()+"\"'";
     196
     197    opt += add;
     198    dbg += add;
    191199
    192200    lib += " -lnova -lz";
  • trunk/Mars/mbase/MAGIC.cc

    r9552 r17307  
    6969    return false;
    7070}
     71
     72TString MARS::GetPackageName() { return PACKAGE_NAME; }
     73TString MARS::GetPackageVersion() { return PACKAGE_VERSION; }
     74TString MARS::GetRevision() { return REVISION; }
  • trunk/Mars/mbase/MAGIC.h

    r8958 r17307  
    3838{
    3939    bool CheckRootVer();
     40    TString GetPackageName();
     41    TString GetPackageVersion();
     42    TString GetRevision();
    4043}
    4144
Note: See TracChangeset for help on using the changeset viewer.