diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-02-27 15:58:20 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-02-27 15:58:20 (GMT) |
| commit | ee227d3af5c0d5abcb8816e34809df60b9665ec1 (patch) | |
| tree | 2575658691b780ee4f6a4e0d8d059639e6925b54 /Source | |
| parent | ac99baa44d985ddbf6f767090c49583bdd8f1aa4 (diff) | |
| download | CMake-ee227d3af5c0d5abcb8816e34809df60b9665ec1.zip CMake-ee227d3af5c0d5abcb8816e34809df60b9665ec1.tar.gz CMake-ee227d3af5c0d5abcb8816e34809df60b9665ec1.tar.bz2 | |
ENH: Several packaging issues. Allow random variables to be passed to cpack (anything starting with CPACK_, add preinstall to the list of dependencies for package, fix typos
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CPack/cmCPackGenericGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmBootstrapCommands.cxx | 2 | ||||
| -rw-r--r-- | Source/cmCommands.cxx | 2 | ||||
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 4 |
4 files changed, 7 insertions, 3 deletions
diff --git a/Source/CPack/cmCPackGenericGenerator.cxx b/Source/CPack/cmCPackGenericGenerator.cxx index b203563..920a89e 100644 --- a/Source/CPack/cmCPackGenericGenerator.cxx +++ b/Source/CPack/cmCPackGenericGenerator.cxx @@ -101,7 +101,7 @@ int cmCPackGenericGenerator::PrepareNames() if ( !this->GetOption("CPACK_PACKAGE_DESCRIPTION") ) { cmCPackLogger(cmCPackLog::LOG_ERROR, - "Project description not specified. Please specify CPACK_PACKAGE_DESCRIPTION or CPACK_PACKAGE_DESCRIPTION_FILE_NAME." + "Project description not specified. Please specify CPACK_PACKAGE_DESCRIPTION or CPACK_PACKAGE_DESCRIPTION_FILE." << std::endl); return 0; } diff --git a/Source/cmBootstrapCommands.cxx b/Source/cmBootstrapCommands.cxx index fe4f32d..e20da55 100644 --- a/Source/cmBootstrapCommands.cxx +++ b/Source/cmBootstrapCommands.cxx @@ -44,6 +44,7 @@ #include "cmFindPathCommand.cxx" #include "cmFindProgramCommand.cxx" #include "cmForEachCommand.cxx" +#include "cmGetCMakePropertyCommand.cxx" #include "cmGetFilenameComponentCommand.cxx" #include "cmGetSourceFilePropertyCommand.cxx" #include "cmGetTargetPropertyCommand.cxx" @@ -102,6 +103,7 @@ void GetBootstrapCommands(std::list<cmCommand*>& commands) commands.push_back(new cmFindPathCommand); commands.push_back(new cmFindProgramCommand); commands.push_back(new cmForEachCommand); + commands.push_back(new cmGetCMakePropertyCommand); commands.push_back(new cmGetFilenameComponentCommand); commands.push_back(new cmGetSourceFilePropertyCommand); commands.push_back(new cmGetTargetPropertyCommand); diff --git a/Source/cmCommands.cxx b/Source/cmCommands.cxx index da4683d..63f5f4d 100644 --- a/Source/cmCommands.cxx +++ b/Source/cmCommands.cxx @@ -22,7 +22,6 @@ #include "cmExportLibraryDependencies.cxx" #include "cmEnableLanguageCommand.cxx" #include "cmFLTKWrapUICommand.cxx" -#include "cmGetCMakePropertyCommand.cxx" #include "cmGetDirectoryPropertyCommand.cxx" #include "cmGetTestPropertyCommand.cxx" #include "cmIncludeExternalMSProjectCommand.cxx" @@ -66,7 +65,6 @@ void GetPredefinedCommands(std::list<cmCommand*>& commands.push_back(new cmExecuteProcessCommand); commands.push_back(new cmExportLibraryDependenciesCommand); commands.push_back(new cmFLTKWrapUICommand); - commands.push_back(new cmGetCMakePropertyCommand); commands.push_back(new cmGetDirectoryPropertyCommand); commands.push_back(new cmGetTestPropertyCommand); commands.push_back(new cmIncludeExternalMSProjectCommand); diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index fe8324e..e783774 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1226,6 +1226,10 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets) configFile += "/CPackConfig.cmake"; singleLine.push_back(configFile); cpackCommandLines.push_back(singleLine); + if ( this->GetPreInstallAvailable() ) + { + depends.push_back("preinstall"); + } (*targets)[this->GetPackageTargetName()] = this->CreateGlobalTarget(this->GetPackageTargetName(), "Run CPack packaging tool...", &cpackCommandLines, depends); |