[Cmake-commits] [cmake-commits] hoffman committed cmBootstrapCommands.cxx 1.27 1.27.2.1 cmCommands.cxx 1.123 1.123.2.1 cmGetCMakePropertyCommand.cxx 1.8 1.8.2.1 cmGetCMakePropertyCommand.h 1.8 1.8.2.1 cmGlobalGenerator.h 1.107.2.3 1.107.2.4 cmGlobalXCodeGenerator.cxx 1.186.2.3 1.186.2.4 cmGlobalXCodeGenerator.h 1.52 1.52.2.1 cmInstallCommand.cxx 1.45.2.2 1.45.2.3 cmInstallFilesCommand.cxx 1.29 1.29.2.1 cmInstallProgramsCommand.cxx 1.22 1.22.2.1 cmInstallTargetGenerator.h 1.24.2.1 1.24.2.2 cmInstallTargetsCommand.cxx 1.15 1.15.2.1 cmake.cxx 1.375.2.8 1.375.2.9
cmake-commits at cmake.org
cmake-commits at cmake.org
Sun Jul 13 17:55:28 EDT 2008
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv32502/Source
Modified Files:
Tag: CMake-2-6
cmBootstrapCommands.cxx cmCommands.cxx
cmGetCMakePropertyCommand.cxx cmGetCMakePropertyCommand.h
cmGlobalGenerator.h cmGlobalXCodeGenerator.cxx
cmGlobalXCodeGenerator.h cmInstallCommand.cxx
cmInstallFilesCommand.cxx cmInstallProgramsCommand.cxx
cmInstallTargetGenerator.h cmInstallTargetsCommand.cxx
cmake.cxx
Log Message:
ENH: Merge from head create RC7
Index: cmGlobalXCodeGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.h,v
retrieving revision 1.52
retrieving revision 1.52.2.1
diff -C 2 -d -r1.52 -r1.52.2.1
*** cmGlobalXCodeGenerator.h 14 Jan 2008 14:20:57 -0000 1.52
--- cmGlobalXCodeGenerator.h 13 Jul 2008 21:55:23 -0000 1.52.2.1
***************
*** 104,107 ****
--- 104,109 ----
cmTarget& cmtarget);
+ std::string ComputeInfoPListLocation(cmTarget& target);
+
void AddCommandsToBuildPhase(cmXCodeObject* buildphase,
cmTarget& target,
Index: cmInstallTargetsCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallTargetsCommand.cxx,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C 2 -d -r1.15 -r1.15.2.1
*** cmInstallTargetsCommand.cxx 23 Jan 2008 15:27:59 -0000 1.15
--- cmInstallTargetsCommand.cxx 13 Jul 2008 21:55:24 -0000 1.15.2.1
***************
*** 63,66 ****
--- 63,69 ----
}
+ this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
+ ->AddInstallComponent("Unspecified");
+
return true;
}
Index: cmGetCMakePropertyCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGetCMakePropertyCommand.cxx,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C 2 -d -r1.8 -r1.8.2.1
*** cmGetCMakePropertyCommand.cxx 23 Jan 2008 15:27:59 -0000 1.8
--- cmGetCMakePropertyCommand.cxx 13 Jul 2008 21:55:23 -0000 1.8.2.1
***************
*** 50,53 ****
--- 50,69 ----
this->Makefile->GetListOfMacros(output);
}
+ else if ( args[1] == "COMPONENTS" )
+ {
+ const std::set<cmStdString>* components
+ = this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
+ ->GetInstallComponents();
+ std::set<cmStdString>::const_iterator compIt;
+ output = "";
+ for (compIt = components->begin(); compIt != components->end(); ++compIt)
+ {
+ if (compIt != components->begin())
+ {
+ output += ";";
+ }
+ output += *compIt;
+ }
+ }
else
{
Index: cmCommands.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCommands.cxx,v
retrieving revision 1.123
retrieving revision 1.123.2.1
diff -C 2 -d -r1.123 -r1.123.2.1
*** cmCommands.cxx 16 Feb 2008 18:05:03 -0000 1.123
--- cmCommands.cxx 13 Jul 2008 21:55:23 -0000 1.123.2.1
***************
*** 25,29 ****
#include "cmExportLibraryDependencies.cxx"
#include "cmFLTKWrapUICommand.cxx"
- #include "cmGetTestPropertyCommand.cxx"
#include "cmIncludeExternalMSProjectCommand.cxx"
#include "cmInstallProgramsCommand.cxx"
--- 25,28 ----
***************
*** 67,71 ****
commands.push_back(new cmExportLibraryDependenciesCommand);
commands.push_back(new cmFLTKWrapUICommand);
- commands.push_back(new cmGetTestPropertyCommand);
commands.push_back(new cmIncludeExternalMSProjectCommand);
commands.push_back(new cmInstallProgramsCommand);
--- 66,69 ----
Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.186.2.3
retrieving revision 1.186.2.4
diff -C 2 -d -r1.186.2.3 -r1.186.2.4
*** cmGlobalXCodeGenerator.cxx 13 Jun 2008 12:55:17 -0000 1.186.2.3
--- cmGlobalXCodeGenerator.cxx 13 Jul 2008 21:55:23 -0000 1.186.2.4
***************
*** 705,709 ****
else
{
! sourceFiles.push_back(xsf);
}
}
--- 705,716 ----
else
{
! // Include this file in the build if it has a known language
! // and has not been listed as an ignored extension for this
! // generator.
! if(this->CurrentLocalGenerator->GetSourceFileLanguage(**i) &&
! !this->IgnoreFile((*i)->GetExtension().c_str()))
! {
! sourceFiles.push_back(xsf);
! }
}
}
***************
*** 1476,1486 ****
{
productType = "com.apple.product-type.application";
! std::string plist = this->CurrentMakefile->GetCurrentOutputDirectory();
! plist += cmake::GetCMakeFilesDirectory();
! plist += "/";
! plist += target.GetName();
! plist += "Info.plist";
this->CurrentLocalGenerator
! ->GenerateAppleInfoPList(&target, productName.c_str(), plist.c_str());
std::string path =
this->ConvertToRelativeForXCode(plist.c_str());
--- 1483,1493 ----
{
productType = "com.apple.product-type.application";
! std::string plist = this->ComputeInfoPListLocation(target);
! // Xcode will create the final version of Info.plist at build time,
! // so let it replace the executable name. This avoids creating
! // a per-configuration Info.plist file.
this->CurrentLocalGenerator
! ->GenerateAppleInfoPList(&target, "$(EXECUTABLE_NAME)",
! plist.c_str());
std::string path =
this->ConvertToRelativeForXCode(plist.c_str());
***************
*** 2210,2218 ****
if(cmtarget.GetPropertyAsBool("MACOSX_BUNDLE"))
{
! std::string plistFile =
! this->CurrentMakefile->GetCurrentOutputDirectory();
! plistFile += "/Info.plist";
! cmSourceFile* sf =
! this->CurrentMakefile->GetOrCreateSource(plistFile.c_str(), true);
cmtarget.AddSourceFile(sf);
}
--- 2217,2222 ----
if(cmtarget.GetPropertyAsBool("MACOSX_BUNDLE"))
{
! std::string plist = this->ComputeInfoPListLocation(cmtarget);
! cmSourceFile* sf = mf->GetOrCreateSource(plist.c_str(), true);
cmtarget.AddSourceFile(sf);
}
***************
*** 2403,2406 ****
--- 2407,2417 ----
this->RootObject->AddAttribute("hasScannedForEncodings",
this->CreateString("0"));
+ // Point Xcode at the top of the source tree.
+ {
+ std::string proot = root->GetMakefile()->GetCurrentDirectory();
+ proot = this->ConvertToRelativeForXCode(proot.c_str());
+ this->RootObject->AddAttribute("projectRoot",
+ this->CreateString(proot.c_str()));
+ }
cmXCodeObject* configlist =
this->CreateObject(cmXCodeObject::XCConfigurationList);
***************
*** 2583,2589 ****
t->GetType() == cmTarget::MODULE_LIBRARY)
{
makefileStream << "\\\n\t" <<
! this->ConvertToRelativeForMake(
! t->GetFullPath(configName).c_str());
}
}
--- 2594,2605 ----
t->GetType() == cmTarget::MODULE_LIBRARY)
{
+ std::string tfull = t->GetFullPath(configName);
+ if(t->IsAppBundleOnApple())
+ {
+ tfull += ".app/Contents/MacOS/";
+ tfull += t->GetFullName(configName);
+ }
makefileStream << "\\\n\t" <<
! this->ConvertToRelativeForMake(tfull.c_str());
}
}
***************
*** 2641,2644 ****
--- 2657,2665 ----
// Create a rule for this target.
std::string tfull = t->GetFullPath(configName);
+ if(t->IsAppBundleOnApple())
+ {
+ tfull += ".app/Contents/MacOS/";
+ tfull += t->GetFullName(configName);
+ }
makefileStream << this->ConvertToRelativeForMake(tfull.c_str())
<< ":";
***************
*** 2962,2963 ****
--- 2983,2996 ----
}
}
+
+ //----------------------------------------------------------------------------
+ std::string
+ cmGlobalXCodeGenerator::ComputeInfoPListLocation(cmTarget& target)
+ {
+ std::string plist = target.GetMakefile()->GetCurrentOutputDirectory();
+ plist += cmake::GetCMakeFilesDirectory();
+ plist += "/";
+ plist += target.GetName();
+ plist += ".dir/Info.plist";
+ return plist;
+ }
Index: cmInstallTargetGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallTargetGenerator.h,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -C 2 -d -r1.24.2.1 -r1.24.2.2
*** cmInstallTargetGenerator.h 21 Apr 2008 00:44:52 -0000 1.24.2.1
--- cmInstallTargetGenerator.h 13 Jul 2008 21:55:24 -0000 1.24.2.2
***************
*** 32,36 ****
std::vector<std::string> const& configurations
= std::vector<std::string>(),
! const char* component = "",
bool optional = false
);
--- 32,36 ----
std::vector<std::string> const& configurations
= std::vector<std::string>(),
! const char* component = "Unspecified",
bool optional = false
);
Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.375.2.8
retrieving revision 1.375.2.9
diff -C 2 -d -r1.375.2.8 -r1.375.2.9
*** cmake.cxx 25 Jun 2008 13:51:32 -0000 1.375.2.8
--- cmake.cxx 13 Jul 2008 21:55:24 -0000 1.375.2.9
***************
*** 2092,2111 ****
// if the project did not define one of the entries below, add them now
// so users can edit the values in the cache:
! // LIBRARY_OUTPUT_PATH
! // EXECUTABLE_OUTPUT_PATH
! if(!this->CacheManager->GetCacheValue("LIBRARY_OUTPUT_PATH"))
! {
! this->CacheManager->AddCacheEntry
! ("LIBRARY_OUTPUT_PATH", "",
! "Single output directory for building all libraries.",
! cmCacheManager::PATH);
! }
! if(!this->CacheManager->GetCacheValue("EXECUTABLE_OUTPUT_PATH"))
{
! this->CacheManager->AddCacheEntry
! ("EXECUTABLE_OUTPUT_PATH", "",
! "Single output directory for building all executables.",
! cmCacheManager::PATH);
! }
if(!this->CacheManager->GetCacheValue("CMAKE_USE_RELATIVE_PATHS"))
{
--- 2092,2119 ----
// if the project did not define one of the entries below, add them now
// so users can edit the values in the cache:
!
! // We used to always present LIBRARY_OUTPUT_PATH and
! // EXECUTABLE_OUTPUT_PATH. They are now documented as old-style and
! // should no longer be used. Therefore we present them only if the
! // project requires compatibility with CMake 2.4. We detect this
! // here by looking for the old CMAKE_BACKWARDS_COMPATABILITY
! // variable created when CMP0001 is not set to NEW.
! if(this->GetCacheManager()->GetCacheValue("CMAKE_BACKWARDS_COMPATIBILITY"))
{
! if(!this->CacheManager->GetCacheValue("LIBRARY_OUTPUT_PATH"))
! {
! this->CacheManager->AddCacheEntry
! ("LIBRARY_OUTPUT_PATH", "",
! "Single output directory for building all libraries.",
! cmCacheManager::PATH);
! }
! if(!this->CacheManager->GetCacheValue("EXECUTABLE_OUTPUT_PATH"))
! {
! this->CacheManager->AddCacheEntry
! ("EXECUTABLE_OUTPUT_PATH", "",
! "Single output directory for building all executables.",
! cmCacheManager::PATH);
! }
! }
if(!this->CacheManager->GetCacheValue("CMAKE_USE_RELATIVE_PATHS"))
{
Index: cmBootstrapCommands.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmBootstrapCommands.cxx,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -C 2 -d -r1.27 -r1.27.2.1
*** cmBootstrapCommands.cxx 1 Mar 2008 20:20:35 -0000 1.27
--- cmBootstrapCommands.cxx 13 Jul 2008 21:55:23 -0000 1.27.2.1
***************
*** 87,90 ****
--- 87,91 ----
#include "cmSetTargetPropertiesCommand.cxx"
#include "cmSetTestsPropertiesCommand.cxx"
+ #include "cmGetTestPropertyCommand.cxx"
#include "cmSiteNameCommand.cxx"
#include "cmStringCommand.cxx"
***************
*** 155,158 ****
--- 156,160 ----
commands.push_back(new cmSetSourceFilesPropertiesCommand);
commands.push_back(new cmSetTargetPropertiesCommand);
+ commands.push_back(new cmGetTestPropertyCommand);
commands.push_back(new cmSetTestsPropertiesCommand);
commands.push_back(new cmSiteNameCommand);
Index: cmInstallCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallCommand.cxx,v
retrieving revision 1.45.2.2
retrieving revision 1.45.2.3
diff -C 2 -d -r1.45.2.2 -r1.45.2.3
*** cmInstallCommand.cxx 23 Apr 2008 16:14:33 -0000 1.45.2.2
--- cmInstallCommand.cxx 13 Jul 2008 21:55:23 -0000 1.45.2.3
***************
*** 385,388 ****
--- 385,399 ----
}
+ // Keep track of whether we will be performing an installation of
+ // any files of the given type.
+ bool installsArchive = false;
+ bool installsLibrary = false;
+ bool installsRuntime = false;
+ bool installsFramework = false;
+ bool installsBundle = false;
+ bool installsPrivateHeader = false;
+ bool installsPublicHeader = false;
+ bool installsResource = false;
+
// Generate install script code to install the given targets.
for(std::vector<cmTarget*>::iterator ti = targets.begin();
***************
*** 692,695 ****
--- 703,716 ----
}
+ // Keep track of whether we're installing anything in each category
+ installsArchive = installsArchive || archiveGenerator != 0;
+ installsLibrary = installsLibrary || libraryGenerator != 0;
+ installsRuntime = installsRuntime || runtimeGenerator != 0;
+ installsFramework = installsFramework || frameworkGenerator != 0;
+ installsBundle = installsBundle || bundleGenerator != 0;
+ installsPrivateHeader = installsPrivateHeader || privateHeaderGenerator != 0;
+ installsPublicHeader = installsPublicHeader || publicHeaderGenerator != 0;
+ installsResource = installsResource || resourceGenerator;
+
this->Makefile->AddInstallGenerator(archiveGenerator);
this->Makefile->AddInstallGenerator(libraryGenerator);
***************
*** 714,733 ****
// Tell the global generator about any installation component names specified
! this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
! ->AddInstallComponent(archiveArgs.GetComponent().c_str());
! this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
! ->AddInstallComponent(libraryArgs.GetComponent().c_str());
! this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
! ->AddInstallComponent(runtimeArgs.GetComponent().c_str());
! this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
! ->AddInstallComponent(frameworkArgs.GetComponent().c_str());
! this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
! ->AddInstallComponent(bundleArgs.GetComponent().c_str());
! this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
! ->AddInstallComponent(privateHeaderArgs.GetComponent().c_str());
! this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
! ->AddInstallComponent(publicHeaderArgs.GetComponent().c_str());
! this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
! ->AddInstallComponent(resourceArgs.GetComponent().c_str());
return true;
--- 735,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());
! }
return true;
Index: cmGetCMakePropertyCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGetCMakePropertyCommand.h,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C 2 -d -r1.8 -r1.8.2.1
*** cmGetCMakePropertyCommand.h 23 Jan 2008 15:27:59 -0000 1.8
--- cmGetCMakePropertyCommand.h 13 Jul 2008 21:55:23 -0000 1.8.2.1
***************
*** 63,67 ****
"property is stored in the variable VAR. If the property is "
"not found, CMake will report an error. Some supported properties "
! "include: VARIABLES, CACHE_VARIABLES, COMMANDS, and MACROS.";
}
--- 63,68 ----
"property is stored in the variable VAR. If the property is "
"not found, CMake will report an error. Some supported properties "
! "include: VARIABLES, CACHE_VARIABLES, COMMANDS, MACROS, and "
! "COMPONENTS.";
}
Index: cmGlobalGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.h,v
retrieving revision 1.107.2.3
retrieving revision 1.107.2.4
diff -C 2 -d -r1.107.2.3 -r1.107.2.4
*** cmGlobalGenerator.h 13 Jun 2008 12:55:17 -0000 1.107.2.3
--- cmGlobalGenerator.h 13 Jul 2008 21:55:23 -0000 1.107.2.4
***************
*** 140,143 ****
--- 140,146 ----
void AddInstallComponent(const char* component);
+ const std::set<cmStdString>* GetInstallComponents() const
+ { return &InstallComponents; }
+
///! Add one installed target to the sets of the exports
void AddTargetToExports(const char* exportSet, cmTarget* target,
Index: cmInstallFilesCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallFilesCommand.cxx,v
retrieving revision 1.29
retrieving revision 1.29.2.1
diff -C 2 -d -r1.29 -r1.29.2.1
*** cmInstallFilesCommand.cxx 28 Jan 2008 13:38:35 -0000 1.29
--- cmInstallFilesCommand.cxx 13 Jul 2008 21:55:24 -0000 1.29.2.1
***************
*** 60,63 ****
--- 60,66 ----
}
+ this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
+ ->AddInstallComponent("Unspecified");
+
return true;
}
***************
*** 127,131 ****
const char* no_permissions = "";
const char* no_rename = "";
! const char* no_component = "";
std::vector<std::string> no_configurations;
this->Makefile->AddInstallGenerator(
--- 130,134 ----
const char* no_permissions = "";
const char* no_rename = "";
! const char* no_component = "Unspecified";
std::vector<std::string> no_configurations;
this->Makefile->AddInstallGenerator(
Index: cmInstallProgramsCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallProgramsCommand.cxx,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C 2 -d -r1.22 -r1.22.2.1
*** cmInstallProgramsCommand.cxx 16 Feb 2008 18:05:03 -0000 1.22
--- cmInstallProgramsCommand.cxx 13 Jul 2008 21:55:24 -0000 1.22.2.1
***************
*** 39,42 ****
--- 39,45 ----
}
+ this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
+ ->AddInstallComponent("Unspecified");
+
return true;
}
***************
*** 88,92 ****
const char* no_permissions = "";
const char* no_rename = "";
! const char* no_component = "";
std::vector<std::string> no_configurations;
this->Makefile->AddInstallGenerator(
--- 91,95 ----
const char* no_permissions = "";
const char* no_rename = "";
! const char* no_component = "Unspecified";
std::vector<std::string> no_configurations;
this->Makefile->AddInstallGenerator(
More information about the Cmake-commits
mailing list