diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-02-14 15:28:40 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-02-14 15:28:40 (GMT) |
| commit | 3bce601c41b8487a18417e32b75c0e22f0750bbc (patch) | |
| tree | 8dc47a279806741f6fa4ab14a702614e364c4684 /Source/CPack/cpack.cxx | |
| parent | 2d29e48726235b71db6e38481dd537fb9eb75876 (diff) | |
| download | CMake-3bce601c41b8487a18417e32b75c0e22f0750bbc.zip CMake-3bce601c41b8487a18417e32b75c0e22f0750bbc.tar.gz CMake-3bce601c41b8487a18417e32b75c0e22f0750bbc.tar.bz2 | |
ENH: Improved support for icons, random directories, etc...
Diffstat (limited to 'Source/CPack/cpack.cxx')
| -rw-r--r-- | Source/CPack/cpack.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index 4b850e8..c35efbe 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -295,12 +295,16 @@ int main (int argc, char *argv[]) parsed = 0; } - cmsys::SystemTools::ConvertToUnixSlashes(cpackProjectDirectory); - std::string makeInstallFile = cpackProjectDirectory + "/cmake_install.cmake"; - if ( !cmsys::SystemTools::FileExists(makeInstallFile.c_str()) ) + if ( !mf->GetDefinition("CPACK_INSTALL_COMMANDS") && !mf->GetDefinition("CPACK_INSTALLED_DIRECTORIES") ) { - cmCPack_Log(&log, cmCPackLog::LOG_ERROR, "Cannot find installation file: " << makeInstallFile.c_str() << std::endl); - parsed = 0; + cmsys::SystemTools::ConvertToUnixSlashes(cpackProjectDirectory); + std::string makeInstallFile = cpackProjectDirectory + "/cmake_install.cmake"; + if ( !cmsys::SystemTools::FileExists(makeInstallFile.c_str()) ) + { + cmCPack_Log(&log, cmCPackLog::LOG_ERROR, "Cannot find installation file: " << makeInstallFile.c_str() << std::endl); + cmCPack_Log(&log, cmCPackLog::LOG_ERROR, "Please specify build tree of the project that uses CMake, specify CPACK_INSTALL_COMMANDS, or specify CPACK_INSTALLED_DIRECTORIES." << std::endl); + parsed = 0; + } } } } |