Commit 2ae0a01a authored by Kelvin Rodriguez's avatar Kelvin Rodriguez
Browse files

undo ISISROOT change

parent 58bce8f5

isis/src/base/apps/autoregtemplate/autoregtemplate.cpp

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ void IsisMain() { 
  // Get user interface

  UserInterface &ui = Application::GetUserInterface();



  Pvl algos(QString(ISISROOT) + "/lib/AutoReg.plugin");

  Pvl algos("$ISISROOT/lib/AutoReg.plugin");

  Pvl p;



  // Begin creating the mapping group

isis/src/base/apps/isisminer/StrategyFactory.cpp

+156 −156
Original line number Diff line number Diff line
@@ -507,8 +507,8 @@ StrategyFactory *StrategyFactory::m_strategymaker = 0; 
     }



     // Append the ISIS library path

     if ( !dirlist.contains(QString(ISISROOT) + "/lib") ) { 

       dirlist.push_back(QString(ISISROOT) + "/lib");

     if ( !dirlist.contains("$ISISROOT/lib") ) { 

       dirlist.push_back("$ISISROOT/lib");

     }



     // Attempt to load the library

isis/src/base/objs/Application/Application.cpp

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ namespace Isis { 
      Preference::Preferences(f.name() == "unitTest.xml");



      if (!f.fileExists()) {

        f = QString(ISISROOT) + "/bin/xml/" + f.name();

        f = "$ISISROOT/bin/xml/" + f.name();

        if (!f.fileExists()) {

          QString message = Message::FileOpen(f.expanded());

          throw IException(IException::Io, message, _FILEINFO_);

isis/src/base/objs/AtmosModelFactory/AtmosModelFactory.cpp

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ namespace Isis { 
      p->read("AtmosModel.plugin");

    }

    else {

      p->read(QString(ISISROOT) + "/lib/AtmosModel.plugin");

      p->read("$ISISROOT/lib/AtmosModel.plugin");

    }



    // Get the algorithm specific plugin and return it

isis/src/base/objs/AutoRegFactory/AutoRegFactory.cpp

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ namespace Isis { 
      p.read("AutoReg.plugin");

    }

    else {

      p.read(QString(ISISROOT) + "/lib/AutoReg.plugin");

      p.read("$ISISROOT/lib/AutoReg.plugin");

    }



    // Get the algorithm specific plugin and return it