[cmake-commits] david.cole committed cmGlobalGenerator.cxx 1.216 1.217
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Dec 31 17:29:23 EST 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv17615/Source
Modified Files:
cmGlobalGenerator.cxx
Log Message:
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".
Index: cmGlobalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.cxx,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -d -r1.216 -r1.217
--- cmGlobalGenerator.cxx 24 Dec 2007 16:15:45 -0000 1.216
+++ cmGlobalGenerator.cxx 31 Dec 2007 22:29:20 -0000 1.217
@@ -1421,6 +1421,15 @@
{
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()]
More information about the Cmake-commits
mailing list