diff options
| author | David Cole <david.cole@kitware.com> | 2007-12-31 22:29:20 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2007-12-31 22:29:20 (GMT) |
| commit | 546c839d04d3be09b0f54f7f107d7381c17af2a8 (patch) | |
| tree | 48ce599fbfe31413023b8fb59e6991b8731a08b4 /Source | |
| parent | 1f987c06eaa083aa5eda825ad1a795fd27edf622 (diff) | |
| download | CMake-546c839d04d3be09b0f54f7f107d7381c17af2a8.zip CMake-546c839d04d3be09b0f54f7f107d7381c17af2a8.tar.gz CMake-546c839d04d3be09b0f54f7f107d7381c17af2a8.tar.bz2 | |
ENH: Add a dependency from the PACKAGE target to the ALL target so that "make package" will first (essentially) do a "make all"... A similar chunk of code already existed for the make install target. This change makes it easy to build an installer package as part of a dashboard run simply by setting CTEST_BUILD_TARGET to "package".
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 7bd98e6..8f8325e 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1421,6 +1421,15 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets) { depends.push_back("preinstall"); } + else + { + const char* noPackageAll = + mf->GetDefinition("CMAKE_SKIP_PACKAGE_ALL_DEPENDENCY"); + if(!noPackageAll || cmSystemTools::IsOff(noPackageAll)) + { + depends.push_back(this->GetAllTargetName()); + } + } if(cmSystemTools::FileExists(configFile.c_str())) { (*targets)[this->GetPackageTargetName()] |