Changeset 6038 for sandbox/src/libraries/core/PathConfig.cc
- Timestamp:
- Nov 5, 2009, 9:22:22 PM (14 years ago)
- Location:
- sandbox
- Files:
-
- 1 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
sandbox
- Property svn:mergeinfo changed
-
sandbox/src/libraries/core/PathConfig.cc
r6035 r6038 70 70 PathConfig* PathConfig::singletonPtr_s = 0; 71 71 72 SetCommandLineArgument(externalDataPath, "").information("Path to the external data files");73 72 SetCommandLineOnlyArgument(writingPathSuffix, "").information("Additional subfolder for config and log files"); 74 73 … … 78 77 , modulePath_(*(new bf::path())) 79 78 , dataPath_(*(new bf::path())) 80 , externalDataPath_(*(new bf::path()))81 79 , configPath_(*(new bf::path())) 82 80 , logPath_(*(new bf::path())) … … 172 170 delete &modulePath_; 173 171 delete &dataPath_; 174 delete &externalDataPath_;175 172 delete &configPath_; 176 173 delete &logPath_; … … 184 181 configPath_ = specialConfig::configDevDirectory; 185 182 logPath_ = specialConfig::logDevDirectory; 186 187 // Check for data path override by the command line188 if (!CommandLineParser::getArgument("externalDataPath")->hasDefaultValue())189 externalDataPath_ = CommandLineParser::getValue("externalDataPath").getString();190 else191 externalDataPath_ = specialConfig::externalDataDevDirectory;192 183 } 193 184 else … … 302 293 } 303 294 304 /*static*/ std::string PathConfig::getExternalDataPathString()305 {306 return getInstance().externalDataPath_.string() + '/';307 }308 309 295 /*static*/ std::string PathConfig::getConfigPathString() 310 296 {
Note: See TracChangeset
for help on using the changeset viewer.