[Cmake-commits] [cmake-commits] hoffman committed cmCTest.cxx 1.338 1.339 cmGlobalVisualStudio71Generator.cxx 1.49 1.50 cmGlobalVisualStudio7Generator.cxx 1.101 1.102 cmIfCommand.cxx 1.89 1.90 cmInstallCommand.cxx 1.48 1.49 cmLocalVisualStudio7Generator.cxx 1.230 1.231 cmMakefile.cxx 1.483 1.484 cmake.cxx 1.396 1.397
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Oct 1 09:04:29 EDT 2008
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv23135/Source
Modified Files:
cmCTest.cxx cmGlobalVisualStudio71Generator.cxx
cmGlobalVisualStudio7Generator.cxx cmIfCommand.cxx
cmInstallCommand.cxx cmLocalVisualStudio7Generator.cxx
cmMakefile.cxx cmake.cxx
Log Message:
STYLE: fix line length stuff for KWStyle
Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.230
retrieving revision 1.231
diff -C 2 -d -r1.230 -r1.231
*** cmLocalVisualStudio7Generator.cxx 8 Sep 2008 21:53:47 -0000 1.230
--- cmLocalVisualStudio7Generator.cxx 1 Oct 2008 13:04:27 -0000 1.231
***************
*** 703,707 ****
}
fout << "\t\t\t\tModulePath=\""
! << this->ConvertToXMLOutputPath(modDir.c_str()) << "\\$(ConfigurationName)\"\n";
}
targetOptions.OutputAdditionalOptions(fout, "\t\t\t\t", "\n");
--- 703,708 ----
}
fout << "\t\t\t\tModulePath=\""
! << this->ConvertToXMLOutputPath(modDir.c_str())
! << "\\$(ConfigurationName)\"\n";
}
targetOptions.OutputAdditionalOptions(fout, "\t\t\t\t", "\n");
Index: cmIfCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmIfCommand.cxx,v
retrieving revision 1.89
retrieving revision 1.90
diff -C 2 -d -r1.89 -r1.90
*** cmIfCommand.cxx 10 Sep 2008 15:58:40 -0000 1.89
--- cmIfCommand.cxx 1 Oct 2008 13:04:27 -0000 1.90
***************
*** 361,365 ****
}
newArgs2.pop_back();
! // now recursively invoke IsTrue to handle the values inside the parenthetical expression
bool value =
cmIfCommand::IsTrue(newArgs2, errorString, makefile);
--- 361,366 ----
}
newArgs2.pop_back();
! // now recursively invoke IsTrue to handle the values inside the
! // parenthetical expression
bool value =
cmIfCommand::IsTrue(newArgs2, errorString, makefile);
Index: cmCTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.cxx,v
retrieving revision 1.338
retrieving revision 1.339
diff -C 2 -d -r1.338 -r1.339
*** cmCTest.cxx 22 Sep 2008 18:04:12 -0000 1.338
--- cmCTest.cxx 1 Oct 2008 13:04:26 -0000 1.339
***************
*** 1655,1659 ****
this->SetParallelLevel(plevel);
}
! if(this->CheckArgument(arg, "--internal-ctest-parallel") && i < args.size() - 1)
{
i++;
--- 1655,1660 ----
this->SetParallelLevel(plevel);
}
! if(this->CheckArgument(arg, "--internal-ctest-parallel")
! && i < args.size() - 1)
{
i++;
Index: cmGlobalVisualStudio71Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio71Generator.cxx,v
retrieving revision 1.49
retrieving revision 1.50
diff -C 2 -d -r1.49 -r1.50
*** cmGlobalVisualStudio71Generator.cxx 30 Apr 2008 17:26:02 -0000 1.49
--- cmGlobalVisualStudio71Generator.cxx 1 Oct 2008 13:04:27 -0000 1.50
***************
*** 156,160 ****
// check to see if this is a fortran build
const char* ext = ".vcproj";
! const char* project = "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \"";
if(this->TargetIsFortranOnly(t))
{
--- 156,161 ----
// check to see if this is a fortran build
const char* ext = ".vcproj";
! const char* project =
! "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \"";
if(this->TargetIsFortranOnly(t))
{
Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.396
retrieving revision 1.397
diff -C 2 -d -r1.396 -r1.397
*** cmake.cxx 22 Sep 2008 15:08:17 -0000 1.396
--- cmake.cxx 1 Oct 2008 13:04:27 -0000 1.397
***************
*** 3971,3975 ****
}
}
! return cmake::VisualStudioLinkNonIncremental(expandedArgs, type, hasManifest, verbose);
}
--- 3971,3976 ----
}
}
! return cmake::VisualStudioLinkNonIncremental(expandedArgs,
! type, hasManifest, verbose);
}
Index: cmInstallCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallCommand.cxx,v
retrieving revision 1.48
retrieving revision 1.49
diff -C 2 -d -r1.48 -r1.49
*** cmInstallCommand.cxx 8 Jul 2008 15:52:25 -0000 1.48
--- cmInstallCommand.cxx 1 Oct 2008 13:04:27 -0000 1.49
***************
*** 608,613 ****
}
- // if(target.GetProperty("ASSOCIATED_FILES");
-
// These well-known sets of files are installed *automatically* for FRAMEWORK
// SHARED library targets on the Mac as part of installing the FRAMEWORK.
--- 608,611 ----
***************
*** 709,713 ****
installsFramework = installsFramework || frameworkGenerator != 0;
installsBundle = installsBundle || bundleGenerator != 0;
! installsPrivateHeader = installsPrivateHeader || privateHeaderGenerator != 0;
installsPublicHeader = installsPublicHeader || publicHeaderGenerator != 0;
installsResource = installsResource || resourceGenerator;
--- 707,712 ----
installsFramework = installsFramework || frameworkGenerator != 0;
installsBundle = installsBundle || bundleGenerator != 0;
! installsPrivateHeader = installsPrivateHeader
! || privateHeaderGenerator != 0;
installsPublicHeader = installsPublicHeader || publicHeaderGenerator != 0;
installsResource = installsResource || resourceGenerator;
***************
*** 734,777 ****
}
! // Tell the global generator about any installation component names specified
if (installsArchive)
{
! this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
! ->AddInstallComponent(archiveArgs.GetComponent().c_str());
}
if (installsLibrary)
{
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
! ->AddInstallComponent(libraryArgs.GetComponent().c_str());
}
if (installsRuntime)
{
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
! ->AddInstallComponent(runtimeArgs.GetComponent().c_str());
}
if (installsFramework)
{
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
! ->AddInstallComponent(frameworkArgs.GetComponent().c_str());
}
if (installsBundle)
{
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
! ->AddInstallComponent(bundleArgs.GetComponent().c_str());
}
if (installsPrivateHeader)
{
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
! ->AddInstallComponent(privateHeaderArgs.GetComponent().c_str());
}
if (installsPublicHeader)
{
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
! ->AddInstallComponent(publicHeaderArgs.GetComponent().c_str());
}
if (installsResource)
{
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
! ->AddInstallComponent(resourceArgs.GetComponent().c_str());
}
--- 733,778 ----
}
! // Tell the global generator about any installation component names
! // specified
if (installsArchive)
{
! this->Makefile->GetLocalGenerator()->
! GetGlobalGenerator()
! ->AddInstallComponent(archiveArgs.GetComponent().c_str());
}
if (installsLibrary)
{
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
! ->AddInstallComponent(libraryArgs.GetComponent().c_str());
}
if (installsRuntime)
{
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
! ->AddInstallComponent(runtimeArgs.GetComponent().c_str());
}
if (installsFramework)
{
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
! ->AddInstallComponent(frameworkArgs.GetComponent().c_str());
}
if (installsBundle)
{
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
! ->AddInstallComponent(bundleArgs.GetComponent().c_str());
}
if (installsPrivateHeader)
{
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
! ->AddInstallComponent(privateHeaderArgs.GetComponent().c_str());
}
if (installsPublicHeader)
{
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
! ->AddInstallComponent(publicHeaderArgs.GetComponent().c_str());
}
if (installsResource)
{
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
! ->AddInstallComponent(resourceArgs.GetComponent().c_str());
}
Index: cmGlobalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio7Generator.cxx,v
retrieving revision 1.101
retrieving revision 1.102
diff -C 2 -d -r1.101 -r1.102
*** cmGlobalVisualStudio7Generator.cxx 19 Aug 2008 19:07:47 -0000 1.101
--- cmGlobalVisualStudio7Generator.cxx 1 Oct 2008 13:04:27 -0000 1.102
***************
*** 487,491 ****
// check to see if this is a fortran build
const char* ext = ".vcproj";
! const char* project = "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \"";
if(this->TargetIsFortranOnly(target))
{
--- 487,492 ----
// check to see if this is a fortran build
const char* ext = ".vcproj";
! const char* project =
! "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \"";
if(this->TargetIsFortranOnly(target))
{
Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.483
retrieving revision 1.484
diff -C 2 -d -r1.483 -r1.484
*** cmMakefile.cxx 24 Sep 2008 12:51:33 -0000 1.483
--- cmMakefile.cxx 1 Oct 2008 13:04:27 -0000 1.484
***************
*** 84,88 ****
this->AddSourceGroup
("Source Files",
! "\\.(C|M|c|c\\+\\+|cc|cpp|cxx|f|f90|for|fpp|ftn|m|mm|rc|def|r|odl|idl|hpj|bat)$");
this->AddSourceGroup("Header Files",
"\\.(h|hh|h\\+\\+|hm|hpp|hxx|in|txx|inl)$");
--- 84,89 ----
this->AddSourceGroup
("Source Files",
! "\\.(C|M|c|c\\+\\+|cc|cpp|cxx|f|f90|for|fpp"
! "|ftn|m|mm|rc|def|r|odl|idl|hpj|bat)$");
this->AddSourceGroup("Header Files",
"\\.(h|hh|h\\+\\+|hm|hpp|hxx|in|txx|inl)$");
More information about the Cmake-commits
mailing list