diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2001-06-21 21:41:23 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2001-06-21 21:41:23 (GMT) |
| commit | 900f1be244f1d996ee2d6a1840978edf050cea26 (patch) | |
| tree | 6456f0076808b93c0cb232697f00bea730227779 /Source/cmake.cxx | |
| parent | 18b2449ca2c4113d1ebf80bf94dda384d643f1a8 (diff) | |
| download | CMake-900f1be244f1d996ee2d6a1840978edf050cea26.zip CMake-900f1be244f1d996ee2d6a1840978edf050cea26.tar.gz CMake-900f1be244f1d996ee2d6a1840978edf050cea26.tar.bz2 | |
BUG: fix for unix
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 52b5f12..63647b5 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -141,12 +141,12 @@ void cmake::AddCMakePaths(const std::vector<std::string>& args) #endif } #ifdef CMAKE_PREFIX - else if(!cmSystemTools::FileExists(cMakeSelf.c_str())) + if(!cmSystemTools::FileExists(cMakeSelf.c_str())) { cMakeSelf = CMAKE_PREFIX "/bin/cmake"; } #endif - else if(!cmSystemTools::FileExists(cMakeSelf.c_str())) + if(!cmSystemTools::FileExists(cMakeSelf.c_str())) { cmSystemTools::Error("CMAKE can not find the command line program cmake. " "Attempted path: ", cMakeSelf.c_str()); @@ -177,16 +177,16 @@ void cmake::AddCMakePaths(const std::vector<std::string>& args) cMakeRoot = cMakeRoot.substr(0, slashPos); } // is there no Modules direcory there? - modules = cMakeRoot + "/Modules/FindVTK.cmake"; + modules = cMakeRoot + "/Modules/FindVTK.cmake"; } - else if (!cmSystemTools::FileExists(modules.c_str())) + if (!cmSystemTools::FileExists(modules.c_str())) { // try exe/../share/cmake modules = cMakeRoot + "/share/CMake/Modules/FindVTK.cmake"; } #ifdef CMAKE_ROOT_DIR - else if (!cmSystemTools::FileExists(modules.c_str())) + if (!cmSystemTools::FileExists(modules.c_str())) { // try compiled in root directory cMakeRoot = CMAKE_ROOT_DIR; @@ -194,21 +194,21 @@ void cmake::AddCMakePaths(const std::vector<std::string>& args) } #endif #ifdef CMAKE_PREFIX - else if (!cmSystemTools::FileExists(modules.c_str())) + if (!cmSystemTools::FileExists(modules.c_str())) { // try compiled in install prefix cMakeRoot = CMAKE_PREFIX "/share/CMake"; modules = cMakeRoot + "/Modules/FindVTK.cmake"; } #endif - else if (!cmSystemTools::FileExists(modules.c_str())) + if (!cmSystemTools::FileExists(modules.c_str())) { // try cMakeRoot = cmSystemTools::GetProgramPath(cMakeSelf.c_str()); cMakeRoot += "/share/CMake"; modules = cMakeRoot + "/Modules/FindVTK.cmake"; } - else if (!cmSystemTools::FileExists(modules.c_str())) + if (!cmSystemTools::FileExists(modules.c_str())) { // couldn't find modules cmSystemTools::Error("Could not find CMAKE_ROOT !!!\n", |