[Cmake-commits] CMake branch, next, updated. v3.3.2-3211-g0cea45e
Brad King
brad.king at kitware.com
Tue Sep 22 16:21:33 EDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 0cea45e48783bb37d60f067c0e6a658b7ac84757 (commit)
via 55559a4f884454348ee7711238c05563ca58855d (commit)
from 5a93c936996b87d748da707058b374f2f71e25ca (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0cea45e48783bb37d60f067c0e6a658b7ac84757
commit 0cea45e48783bb37d60f067c0e6a658b7ac84757
Merge: 5a93c93 55559a4
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 22 16:21:31 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 22 16:21:31 2015 -0400
Merge topic 'install-generator-mf' into next
55559a4f Revert topic 'install-generator-mf'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55559a4f884454348ee7711238c05563ca58855d
commit 55559a4f884454348ee7711238c05563ca58855d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 22 16:20:25 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 22 16:20:34 2015 -0400
Revert topic 'install-generator-mf'
Propagation of cmMakefile pointers is not consistent with the
refactoring in progress elsewhere to separate configure-time and
generate-time structures.
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index d9e8823..333c2ff 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -27,9 +27,7 @@ static cmInstallTargetGenerator* CreateInstallTargetGenerator(cmTarget& target,
{
cmInstallGenerator::MessageLevel message =
cmInstallGenerator::SelectMessageLevel(target.GetMakefile());
- return new cmInstallTargetGenerator(
- target.GetMakefile(),
- target.GetName(),
+ return new cmInstallTargetGenerator(target.GetName(),
args.GetDestination().c_str(),
impLib, args.GetPermissions().c_str(),
args.GetConfigurations(), args.GetComponent().c_str(),
@@ -45,7 +43,6 @@ static cmInstallFilesGenerator* CreateInstallFilesGenerator(
cmInstallGenerator::MessageLevel message =
cmInstallGenerator::SelectMessageLevel(mf);
return new cmInstallFilesGenerator(
- mf,
absFiles, args.GetDestination().c_str(),
programs, args.GetPermissions().c_str(),
args.GetConfigurations(), args.GetComponent().c_str(),
@@ -176,8 +173,7 @@ bool cmInstallCommand::HandleScriptMode(std::vector<std::string> const& args)
return false;
}
this->Makefile->AddInstallGenerator(
- new cmInstallScriptGenerator(this->Makefile,
- script.c_str(), false,
+ new cmInstallScriptGenerator(script.c_str(), false,
component.c_str()));
}
else if(doing_code)
@@ -185,8 +181,7 @@ bool cmInstallCommand::HandleScriptMode(std::vector<std::string> const& args)
doing_code = false;
std::string code = args[i];
this->Makefile->AddInstallGenerator(
- new cmInstallScriptGenerator(this->Makefile,
- code.c_str(), true,
+ new cmInstallScriptGenerator(code.c_str(), true,
component.c_str()));
}
}
@@ -1277,8 +1272,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
// Create the directory install generator.
this->Makefile->AddInstallGenerator(
- new cmInstallDirectoryGenerator(this->Makefile,
- dirs, destination,
+ new cmInstallDirectoryGenerator(dirs, destination,
permissions_file.c_str(),
permissions_dir.c_str(),
configurations,
@@ -1408,7 +1402,6 @@ bool cmInstallCommand::HandleExportMode(std::vector<std::string> const& args)
// Create the export install generator.
cmInstallExportGenerator* exportGenerator =
new cmInstallExportGenerator(
- this->Makefile,
exportSet,
ica.GetDestination().c_str(),
ica.GetPermissions().c_str(), ica.GetConfigurations(),
diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx
index fb94d59..7593380 100644
--- a/Source/cmInstallDirectoryGenerator.cxx
+++ b/Source/cmInstallDirectoryGenerator.cxx
@@ -15,8 +15,7 @@
//----------------------------------------------------------------------------
cmInstallDirectoryGenerator
-::cmInstallDirectoryGenerator(cmMakefile* mf,
- std::vector<std::string> const& dirs,
+::cmInstallDirectoryGenerator(std::vector<std::string> const& dirs,
const char* dest,
const char* file_permissions,
const char* dir_permissions,
@@ -25,7 +24,7 @@ cmInstallDirectoryGenerator
MessageLevel message,
const char* literal_args,
bool optional):
- cmInstallGenerator(mf, dest, configurations, component, message),
+ cmInstallGenerator(dest, configurations, component, message),
Directories(dirs),
FilePermissions(file_permissions), DirPermissions(dir_permissions),
LiteralArguments(literal_args), Optional(optional)
diff --git a/Source/cmInstallDirectoryGenerator.h b/Source/cmInstallDirectoryGenerator.h
index d3b3def..165ab91 100644
--- a/Source/cmInstallDirectoryGenerator.h
+++ b/Source/cmInstallDirectoryGenerator.h
@@ -20,8 +20,7 @@
class cmInstallDirectoryGenerator: public cmInstallGenerator
{
public:
- cmInstallDirectoryGenerator(cmMakefile* mf,
- std::vector<std::string> const& dirs,
+ cmInstallDirectoryGenerator(std::vector<std::string> const& dirs,
const char* dest,
const char* file_permissions,
const char* dir_permissions,
diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx
index ad60e2b..97b9405 100644
--- a/Source/cmInstallExportGenerator.cxx
+++ b/Source/cmInstallExportGenerator.cxx
@@ -27,7 +27,6 @@
//----------------------------------------------------------------------------
cmInstallExportGenerator::cmInstallExportGenerator(
- cmMakefile* mf,
cmExportSet* exportSet,
const char* destination,
const char* file_permissions,
@@ -36,7 +35,7 @@ cmInstallExportGenerator::cmInstallExportGenerator(
MessageLevel message,
const char* filename, const char* name_space,
bool exportOld)
- :cmInstallGenerator(mf, destination, configurations, component, message)
+ :cmInstallGenerator(destination, configurations, component, message)
,ExportSet(exportSet)
,FilePermissions(file_permissions)
,FileName(filename)
diff --git a/Source/cmInstallExportGenerator.h b/Source/cmInstallExportGenerator.h
index 145e681..885ed05 100644
--- a/Source/cmInstallExportGenerator.h
+++ b/Source/cmInstallExportGenerator.h
@@ -26,8 +26,7 @@ class cmMakefile;
class cmInstallExportGenerator: public cmInstallGenerator
{
public:
- cmInstallExportGenerator(cmMakefile* mf,
- cmExportSet* exportSet,
+ cmInstallExportGenerator(cmExportSet* exportSet,
const char* dest, const char* file_permissions,
const std::vector<std::string>& configurations,
const char* component,
diff --git a/Source/cmInstallFilesCommand.cxx b/Source/cmInstallFilesCommand.cxx
index c714a52..68557bd 100644
--- a/Source/cmInstallFilesCommand.cxx
+++ b/Source/cmInstallFilesCommand.cxx
@@ -128,8 +128,7 @@ void cmInstallFilesCommand::CreateInstallGenerator() const
cmInstallGenerator::MessageLevel message =
cmInstallGenerator::SelectMessageLevel(this->Makefile);
this->Makefile->AddInstallGenerator(
- new cmInstallFilesGenerator(this->Makefile,
- this->Files,
+ new cmInstallFilesGenerator(this->Files,
destination.c_str(), false,
no_permissions, no_configurations,
no_component.c_str(), message, no_rename));
diff --git a/Source/cmInstallFilesGenerator.cxx b/Source/cmInstallFilesGenerator.cxx
index 88e96b4..c18b174 100644
--- a/Source/cmInstallFilesGenerator.cxx
+++ b/Source/cmInstallFilesGenerator.cxx
@@ -14,11 +14,11 @@
#include "cmGeneratorExpression.h"
#include "cmMakefile.h"
#include "cmSystemTools.h"
+#include "cmLocalGenerator.h"
//----------------------------------------------------------------------------
cmInstallFilesGenerator
-::cmInstallFilesGenerator(cmMakefile* mf,
- std::vector<std::string> const& files,
+::cmInstallFilesGenerator(std::vector<std::string> const& files,
const char* dest, bool programs,
const char* file_permissions,
std::vector<std::string> const& configurations,
@@ -26,7 +26,8 @@ cmInstallFilesGenerator
MessageLevel message,
const char* rename,
bool optional):
- cmInstallGenerator(mf, dest, configurations, component, message),
+ cmInstallGenerator(dest, configurations, component, message),
+ LocalGenerator(0),
Files(files),
FilePermissions(file_permissions),
Rename(rename),
@@ -50,6 +51,11 @@ cmInstallFilesGenerator
{
}
+void cmInstallFilesGenerator::Compute(cmLocalGenerator* lg)
+{
+ this->LocalGenerator = lg;
+}
+
//----------------------------------------------------------------------------
void cmInstallFilesGenerator::AddFilesInstallRule(
std::ostream& os, Indent const& indent,
@@ -93,8 +99,8 @@ void cmInstallFilesGenerator::GenerateScriptForConfig(std::ostream& os,
i != this->Files.end(); ++i)
{
cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(*i);
- cmSystemTools::ExpandListArgument(cge->Evaluate(this->Makefile, config),
- files);
+ cmSystemTools::ExpandListArgument(cge->Evaluate(
+ this->LocalGenerator->GetMakefile(), config), files);
}
this->AddFilesInstallRule(os, indent, files);
}
diff --git a/Source/cmInstallFilesGenerator.h b/Source/cmInstallFilesGenerator.h
index 80e51cb..00b3a79 100644
--- a/Source/cmInstallFilesGenerator.h
+++ b/Source/cmInstallFilesGenerator.h
@@ -20,8 +20,7 @@
class cmInstallFilesGenerator: public cmInstallGenerator
{
public:
- cmInstallFilesGenerator(cmMakefile* mf,
- std::vector<std::string> const& files,
+ cmInstallFilesGenerator(std::vector<std::string> const& files,
const char* dest, bool programs,
const char* file_permissions,
std::vector<std::string> const& configurations,
@@ -31,6 +30,8 @@ public:
bool optional = false);
virtual ~cmInstallFilesGenerator();
+ void Compute(cmLocalGenerator* lg);
+
protected:
virtual void GenerateScriptActions(std::ostream& os, Indent const& indent);
virtual void GenerateScriptForConfig(std::ostream& os,
@@ -39,6 +40,7 @@ protected:
void AddFilesInstallRule(std::ostream& os, Indent const& indent,
std::vector<std::string> const& files);
+ cmLocalGenerator* LocalGenerator;
std::vector<std::string> Files;
std::string FilePermissions;
std::string Rename;
diff --git a/Source/cmInstallGenerator.cxx b/Source/cmInstallGenerator.cxx
index fbbce77..2e1c5f0 100644
--- a/Source/cmInstallGenerator.cxx
+++ b/Source/cmInstallGenerator.cxx
@@ -16,13 +16,11 @@
//----------------------------------------------------------------------------
cmInstallGenerator
-::cmInstallGenerator(cmMakefile* mf,
- const char* destination,
+::cmInstallGenerator(const char* destination,
std::vector<std::string> const& configurations,
const char* component,
MessageLevel message):
cmScriptGenerator("CMAKE_INSTALL_CONFIG_NAME", configurations),
- Makefile(mf),
Destination(destination? destination:""),
Component(component? component:""),
Message(message)
diff --git a/Source/cmInstallGenerator.h b/Source/cmInstallGenerator.h
index d84cf83..b8e5b53 100644
--- a/Source/cmInstallGenerator.h
+++ b/Source/cmInstallGenerator.h
@@ -33,8 +33,7 @@ public:
MessageNever
};
- cmInstallGenerator(cmMakefile* mf,
- const char* destination,
+ cmInstallGenerator(const char* destination,
std::vector<std::string> const& configurations,
const char* component,
MessageLevel message);
@@ -71,7 +70,6 @@ protected:
std::string CreateComponentTest(const char* component);
// Information shared by most generator types.
- cmMakefile* Makefile;
std::string Destination;
std::string Component;
MessageLevel Message;
diff --git a/Source/cmInstallProgramsCommand.cxx b/Source/cmInstallProgramsCommand.cxx
index 03322c2..e6fbe88 100644
--- a/Source/cmInstallProgramsCommand.cxx
+++ b/Source/cmInstallProgramsCommand.cxx
@@ -91,8 +91,7 @@ void cmInstallProgramsCommand::FinalPass()
cmInstallGenerator::MessageLevel message =
cmInstallGenerator::SelectMessageLevel(this->Makefile);
this->Makefile->AddInstallGenerator(
- new cmInstallFilesGenerator(this->Makefile,
- this->Files,
+ new cmInstallFilesGenerator(this->Files,
destination.c_str(), true,
no_permissions, no_configurations,
no_component.c_str(), message, no_rename));
diff --git a/Source/cmInstallScriptGenerator.cxx b/Source/cmInstallScriptGenerator.cxx
index 9f43f80..933aa07 100644
--- a/Source/cmInstallScriptGenerator.cxx
+++ b/Source/cmInstallScriptGenerator.cxx
@@ -13,11 +13,9 @@
//----------------------------------------------------------------------------
cmInstallScriptGenerator
-::cmInstallScriptGenerator(cmMakefile* mf,
- const char* script, bool code,
+::cmInstallScriptGenerator(const char* script, bool code,
const char* component) :
- cmInstallGenerator(mf, 0, std::vector<std::string>(),
- component, MessageDefault),
+ cmInstallGenerator(0, std::vector<std::string>(), component, MessageDefault),
Script(script), Code(code)
{
}
diff --git a/Source/cmInstallScriptGenerator.h b/Source/cmInstallScriptGenerator.h
index 41dd319..54a7b21 100644
--- a/Source/cmInstallScriptGenerator.h
+++ b/Source/cmInstallScriptGenerator.h
@@ -20,9 +20,7 @@
class cmInstallScriptGenerator: public cmInstallGenerator
{
public:
- cmInstallScriptGenerator(
- cmMakefile* mf,
- const char* script, bool code,
+ cmInstallScriptGenerator(const char* script, bool code,
const char* component);
virtual ~cmInstallScriptGenerator();
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index f33dbb6..30cf175 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -24,15 +24,14 @@
//----------------------------------------------------------------------------
cmInstallTargetGenerator
-::cmInstallTargetGenerator(cmMakefile* mf,
- const std::string& targetName,
+::cmInstallTargetGenerator(const std::string& targetName,
const char* dest, bool implib,
const char* file_permissions,
std::vector<std::string> const& configurations,
const char* component,
MessageLevel message,
bool optional):
- cmInstallGenerator(mf, dest, configurations, component, message),
+ cmInstallGenerator(dest, configurations, component, message),
TargetName(targetName),
Target(0),
FilePermissions(file_permissions),
@@ -77,7 +76,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
if(this->Target->NeedRelinkBeforeInstall(config))
{
fromDirConfig =
- this->Makefile->GetCurrentBinaryDirectory();
+ this->Target->Target->GetMakefile()->GetCurrentBinaryDirectory();
fromDirConfig += cmake::GetCMakeFilesDirectory();
fromDirConfig += "/CMakeRelink.dir/";
}
@@ -113,7 +112,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
case cmTarget::UTILITY:
case cmTarget::GLOBAL_TARGET:
case cmTarget::UNKNOWN_LIBRARY:
- this->Makefile->IssueMessage(cmake::INTERNAL_ERROR,
+ this->Target->Target->GetMakefile()->IssueMessage(cmake::INTERNAL_ERROR,
"cmInstallTargetGenerator created with non-installable target.");
return;
}
@@ -351,7 +350,8 @@ std::string
cmInstallTargetGenerator::GetDestination(std::string const& config) const
{
cmGeneratorExpression ge;
- return ge.Parse(this->Destination)->Evaluate(this->Makefile, config);
+ return ge.Parse(this->Destination)
+ ->Evaluate(this->Target->Target->GetMakefile(), config);
}
//----------------------------------------------------------------------------
@@ -550,7 +550,7 @@ cmInstallTargetGenerator
}
// Fix the install_name settings in installed binaries.
- std::string installNameTool = this->Makefile
+ std::string installNameTool = this->Target->Target->GetMakefile()
->GetSafeDefinition("CMAKE_INSTALL_NAME_TOOL");
if(installNameTool.empty())
@@ -664,7 +664,8 @@ cmInstallTargetGenerator
return;
}
// Skip if on Apple
- if(this->Makefile->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME"))
+ if(this->Target->Target->GetMakefile()
+ ->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME"))
{
return;
}
@@ -709,7 +710,7 @@ cmInstallTargetGenerator
return;
}
- cmMakefile* mf = this->Makefile;
+ cmMakefile* mf = this->Target->Target->GetMakefile();
if(mf->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME"))
{
@@ -821,20 +822,20 @@ cmInstallTargetGenerator::AddStripRule(std::ostream& os,
}
// Don't handle OSX Bundles.
- if(this->Makefile->IsOn("APPLE") &&
+ if(this->Target->Target->GetMakefile()->IsOn("APPLE") &&
this->Target->Target->GetPropertyAsBool("MACOSX_BUNDLE"))
{
return;
}
- if(! this->Makefile->IsSet("CMAKE_STRIP"))
+ if(! this->Target->Target->GetMakefile()->IsSet("CMAKE_STRIP"))
{
return;
}
os << indent << "if(CMAKE_INSTALL_DO_STRIP)\n";
os << indent << " execute_process(COMMAND \""
- << this->Makefile->GetDefinition("CMAKE_STRIP")
+ << this->Target->Target->GetMakefile()->GetDefinition("CMAKE_STRIP")
<< "\" \"" << toDestDirPath << "\")\n";
os << indent << "endif()\n";
}
@@ -853,13 +854,13 @@ cmInstallTargetGenerator::AddRanlibRule(std::ostream& os,
// Perform post-installation processing on the file depending
// on its type.
- if(!this->Makefile->IsOn("APPLE"))
+ if(!this->Target->Target->GetMakefile()->IsOn("APPLE"))
{
return;
}
std::string ranlib =
- this->Makefile->GetRequiredDefinition("CMAKE_RANLIB");
+ this->Target->Target->GetMakefile()->GetRequiredDefinition("CMAKE_RANLIB");
if(ranlib.empty())
{
return;
diff --git a/Source/cmInstallTargetGenerator.h b/Source/cmInstallTargetGenerator.h
index e6064d1..a8f4a75 100644
--- a/Source/cmInstallTargetGenerator.h
+++ b/Source/cmInstallTargetGenerator.h
@@ -24,7 +24,6 @@ class cmInstallTargetGenerator: public cmInstallGenerator
{
public:
cmInstallTargetGenerator(
- cmMakefile* mf,
std::string const& targetName, const char* dest, bool implib,
const char* file_permissions,
std::vector<std::string> const& configurations,
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index dff06b9..6c7b194 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2465,8 +2465,7 @@ public:
cmInstallTargetGeneratorLocal(cmLocalGenerator* lg, std::string const& t,
const char* dest, bool implib):
cmInstallTargetGenerator(
- lg->GetMakefile(), t, dest, implib, "",
- std::vector<std::string>(), "Unspecified",
+ t, dest, implib, "", std::vector<std::string>(), "Unspecified",
cmInstallGenerator::SelectMessageLevel(lg->GetMakefile()),
false)
{
@@ -2494,7 +2493,7 @@ cmLocalGenerator
// Include the user-specified pre-install script for this target.
if(const char* preinstall = l->second.GetProperty("PRE_INSTALL_SCRIPT"))
{
- cmInstallScriptGenerator g(this->Makefile, preinstall, false, 0);
+ cmInstallScriptGenerator g(preinstall, false, 0);
g.Generate(os, config, configurationTypes);
}
@@ -2555,7 +2554,7 @@ cmLocalGenerator
// Include the user-specified post-install script for this target.
if(const char* postinstall = l->second.GetProperty("POST_INSTALL_SCRIPT"))
{
- cmInstallScriptGenerator g(this->Makefile, postinstall, false, 0);
+ cmInstallScriptGenerator g(postinstall, false, 0);
g.Generate(os, config, configurationTypes);
}
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmInstallCommand.cxx | 15 ++++-----------
Source/cmInstallDirectoryGenerator.cxx | 5 ++---
Source/cmInstallDirectoryGenerator.h | 3 +--
Source/cmInstallExportGenerator.cxx | 3 +--
Source/cmInstallExportGenerator.h | 3 +--
Source/cmInstallFilesCommand.cxx | 3 +--
Source/cmInstallFilesGenerator.cxx | 16 +++++++++++-----
Source/cmInstallFilesGenerator.h | 6 ++++--
Source/cmInstallGenerator.cxx | 4 +---
Source/cmInstallGenerator.h | 4 +---
Source/cmInstallProgramsCommand.cxx | 3 +--
Source/cmInstallScriptGenerator.cxx | 6 ++----
Source/cmInstallScriptGenerator.h | 4 +---
Source/cmInstallTargetGenerator.cxx | 29 +++++++++++++++--------------
Source/cmInstallTargetGenerator.h | 1 -
Source/cmLocalGenerator.cxx | 7 +++----
16 files changed, 49 insertions(+), 63 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list