[Cmake-commits] CMake branch, next, updated. v3.3.2-3207-g0f5c8e0
Brad King
brad.king at kitware.com
Tue Sep 22 13:01:37 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 0f5c8e098d6a0e5da25aaea60b089f7d11205ab1 (commit)
via 3f6b267d17cddb67e4251bb0ff28bb1a21498417 (commit)
via e4b1728c2cd4feadad6122bef836f507e974d1aa (commit)
via d44cb3277ce4810acb223140b3aafc35a5c31893 (commit)
from 95c39028ede8b8ba988f6d0f6964b0f7ce2bf76b (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=0f5c8e098d6a0e5da25aaea60b089f7d11205ab1
commit 0f5c8e098d6a0e5da25aaea60b089f7d11205ab1
Merge: 95c3902 3f6b267
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 22 13:01:36 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 22 13:01:36 2015 -0400
Merge topic 'install-generator-mf' into next
3f6b267d cmInstallTargetGenerator: Simplify using Makefile member
e4b1728c cmInstallFilesGenerator: Drop LocalGenerator member
d44cb327 cmInstallGenerator: Add Makefile member
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f6b267d17cddb67e4251bb0ff28bb1a21498417
commit 3f6b267d17cddb67e4251bb0ff28bb1a21498417
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 22 11:16:59 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 22 11:40:45 2015 -0400
cmInstallTargetGenerator: Simplify using Makefile member
We now have the cmMakefile in which install(TARGETS) was invoked
as a member so we do not need to look it up through the installed
target anymore.
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 7b2893c..f33dbb6 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -77,7 +77,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
if(this->Target->NeedRelinkBeforeInstall(config))
{
fromDirConfig =
- this->Target->Target->GetMakefile()->GetCurrentBinaryDirectory();
+ this->Makefile->GetCurrentBinaryDirectory();
fromDirConfig += cmake::GetCMakeFilesDirectory();
fromDirConfig += "/CMakeRelink.dir/";
}
@@ -113,7 +113,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
case cmTarget::UTILITY:
case cmTarget::GLOBAL_TARGET:
case cmTarget::UNKNOWN_LIBRARY:
- this->Target->Target->GetMakefile()->IssueMessage(cmake::INTERNAL_ERROR,
+ this->Makefile->IssueMessage(cmake::INTERNAL_ERROR,
"cmInstallTargetGenerator created with non-installable target.");
return;
}
@@ -351,8 +351,7 @@ std::string
cmInstallTargetGenerator::GetDestination(std::string const& config) const
{
cmGeneratorExpression ge;
- return ge.Parse(this->Destination)
- ->Evaluate(this->Target->Target->GetMakefile(), config);
+ return ge.Parse(this->Destination)->Evaluate(this->Makefile, config);
}
//----------------------------------------------------------------------------
@@ -551,7 +550,7 @@ cmInstallTargetGenerator
}
// Fix the install_name settings in installed binaries.
- std::string installNameTool = this->Target->Target->GetMakefile()
+ std::string installNameTool = this->Makefile
->GetSafeDefinition("CMAKE_INSTALL_NAME_TOOL");
if(installNameTool.empty())
@@ -665,8 +664,7 @@ cmInstallTargetGenerator
return;
}
// Skip if on Apple
- if(this->Target->Target->GetMakefile()
- ->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME"))
+ if(this->Makefile->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME"))
{
return;
}
@@ -711,7 +709,7 @@ cmInstallTargetGenerator
return;
}
- cmMakefile* mf = this->Target->Target->GetMakefile();
+ cmMakefile* mf = this->Makefile;
if(mf->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME"))
{
@@ -823,20 +821,20 @@ cmInstallTargetGenerator::AddStripRule(std::ostream& os,
}
// Don't handle OSX Bundles.
- if(this->Target->Target->GetMakefile()->IsOn("APPLE") &&
+ if(this->Makefile->IsOn("APPLE") &&
this->Target->Target->GetPropertyAsBool("MACOSX_BUNDLE"))
{
return;
}
- if(! this->Target->Target->GetMakefile()->IsSet("CMAKE_STRIP"))
+ if(! this->Makefile->IsSet("CMAKE_STRIP"))
{
return;
}
os << indent << "if(CMAKE_INSTALL_DO_STRIP)\n";
os << indent << " execute_process(COMMAND \""
- << this->Target->Target->GetMakefile()->GetDefinition("CMAKE_STRIP")
+ << this->Makefile->GetDefinition("CMAKE_STRIP")
<< "\" \"" << toDestDirPath << "\")\n";
os << indent << "endif()\n";
}
@@ -855,13 +853,13 @@ cmInstallTargetGenerator::AddRanlibRule(std::ostream& os,
// Perform post-installation processing on the file depending
// on its type.
- if(!this->Target->Target->GetMakefile()->IsOn("APPLE"))
+ if(!this->Makefile->IsOn("APPLE"))
{
return;
}
std::string ranlib =
- this->Target->Target->GetMakefile()->GetRequiredDefinition("CMAKE_RANLIB");
+ this->Makefile->GetRequiredDefinition("CMAKE_RANLIB");
if(ranlib.empty())
{
return;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4b1728c2cd4feadad6122bef836f507e974d1aa
commit e4b1728c2cd4feadad6122bef836f507e974d1aa
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 22 11:12:47 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 22 11:40:45 2015 -0400
cmInstallFilesGenerator: Drop LocalGenerator member
The LocalGenerator member was used only to get to the cmMakefile in
which the install(FILES) command was invoked. We now have a member
providing that directly instead, so drop the LocalGenerator member.
diff --git a/Source/cmInstallFilesGenerator.cxx b/Source/cmInstallFilesGenerator.cxx
index addea48..88e96b4 100644
--- a/Source/cmInstallFilesGenerator.cxx
+++ b/Source/cmInstallFilesGenerator.cxx
@@ -14,7 +14,6 @@
#include "cmGeneratorExpression.h"
#include "cmMakefile.h"
#include "cmSystemTools.h"
-#include "cmLocalGenerator.h"
//----------------------------------------------------------------------------
cmInstallFilesGenerator
@@ -28,7 +27,6 @@ cmInstallFilesGenerator
const char* rename,
bool optional):
cmInstallGenerator(mf, dest, configurations, component, message),
- LocalGenerator(0),
Files(files),
FilePermissions(file_permissions),
Rename(rename),
@@ -52,11 +50,6 @@ cmInstallFilesGenerator
{
}
-void cmInstallFilesGenerator::Compute(cmLocalGenerator* lg)
-{
- this->LocalGenerator = lg;
-}
-
//----------------------------------------------------------------------------
void cmInstallFilesGenerator::AddFilesInstallRule(
std::ostream& os, Indent const& indent,
@@ -100,8 +93,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->LocalGenerator->GetMakefile(), config), files);
+ cmSystemTools::ExpandListArgument(cge->Evaluate(this->Makefile, config),
+ files);
}
this->AddFilesInstallRule(os, indent, files);
}
diff --git a/Source/cmInstallFilesGenerator.h b/Source/cmInstallFilesGenerator.h
index baf30ae..80e51cb 100644
--- a/Source/cmInstallFilesGenerator.h
+++ b/Source/cmInstallFilesGenerator.h
@@ -31,8 +31,6 @@ 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,
@@ -41,7 +39,6 @@ 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;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d44cb3277ce4810acb223140b3aafc35a5c31893
commit d44cb3277ce4810acb223140b3aafc35a5c31893
Author: Robert Goulet <Robert.Goulet at autodesk.com>
AuthorDate: Tue Sep 22 13:58:26 2015 +0000
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 22 11:40:45 2015 -0400
cmInstallGenerator: Add Makefile member
This will be needed to add generator expression support to more
arguments of the install() command.
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index 333c2ff..d9e8823 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -27,7 +27,9 @@ static cmInstallTargetGenerator* CreateInstallTargetGenerator(cmTarget& target,
{
cmInstallGenerator::MessageLevel message =
cmInstallGenerator::SelectMessageLevel(target.GetMakefile());
- return new cmInstallTargetGenerator(target.GetName(),
+ return new cmInstallTargetGenerator(
+ target.GetMakefile(),
+ target.GetName(),
args.GetDestination().c_str(),
impLib, args.GetPermissions().c_str(),
args.GetConfigurations(), args.GetComponent().c_str(),
@@ -43,6 +45,7 @@ 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(),
@@ -173,7 +176,8 @@ bool cmInstallCommand::HandleScriptMode(std::vector<std::string> const& args)
return false;
}
this->Makefile->AddInstallGenerator(
- new cmInstallScriptGenerator(script.c_str(), false,
+ new cmInstallScriptGenerator(this->Makefile,
+ script.c_str(), false,
component.c_str()));
}
else if(doing_code)
@@ -181,7 +185,8 @@ bool cmInstallCommand::HandleScriptMode(std::vector<std::string> const& args)
doing_code = false;
std::string code = args[i];
this->Makefile->AddInstallGenerator(
- new cmInstallScriptGenerator(code.c_str(), true,
+ new cmInstallScriptGenerator(this->Makefile,
+ code.c_str(), true,
component.c_str()));
}
}
@@ -1272,7 +1277,8 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
// Create the directory install generator.
this->Makefile->AddInstallGenerator(
- new cmInstallDirectoryGenerator(dirs, destination,
+ new cmInstallDirectoryGenerator(this->Makefile,
+ dirs, destination,
permissions_file.c_str(),
permissions_dir.c_str(),
configurations,
@@ -1402,6 +1408,7 @@ 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 7593380..fb94d59 100644
--- a/Source/cmInstallDirectoryGenerator.cxx
+++ b/Source/cmInstallDirectoryGenerator.cxx
@@ -15,7 +15,8 @@
//----------------------------------------------------------------------------
cmInstallDirectoryGenerator
-::cmInstallDirectoryGenerator(std::vector<std::string> const& dirs,
+::cmInstallDirectoryGenerator(cmMakefile* mf,
+ std::vector<std::string> const& dirs,
const char* dest,
const char* file_permissions,
const char* dir_permissions,
@@ -24,7 +25,7 @@ cmInstallDirectoryGenerator
MessageLevel message,
const char* literal_args,
bool optional):
- cmInstallGenerator(dest, configurations, component, message),
+ cmInstallGenerator(mf, 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 165ab91..d3b3def 100644
--- a/Source/cmInstallDirectoryGenerator.h
+++ b/Source/cmInstallDirectoryGenerator.h
@@ -20,7 +20,8 @@
class cmInstallDirectoryGenerator: public cmInstallGenerator
{
public:
- cmInstallDirectoryGenerator(std::vector<std::string> const& dirs,
+ cmInstallDirectoryGenerator(cmMakefile* mf,
+ 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 97b9405..ad60e2b 100644
--- a/Source/cmInstallExportGenerator.cxx
+++ b/Source/cmInstallExportGenerator.cxx
@@ -27,6 +27,7 @@
//----------------------------------------------------------------------------
cmInstallExportGenerator::cmInstallExportGenerator(
+ cmMakefile* mf,
cmExportSet* exportSet,
const char* destination,
const char* file_permissions,
@@ -35,7 +36,7 @@ cmInstallExportGenerator::cmInstallExportGenerator(
MessageLevel message,
const char* filename, const char* name_space,
bool exportOld)
- :cmInstallGenerator(destination, configurations, component, message)
+ :cmInstallGenerator(mf, destination, configurations, component, message)
,ExportSet(exportSet)
,FilePermissions(file_permissions)
,FileName(filename)
diff --git a/Source/cmInstallExportGenerator.h b/Source/cmInstallExportGenerator.h
index 885ed05..145e681 100644
--- a/Source/cmInstallExportGenerator.h
+++ b/Source/cmInstallExportGenerator.h
@@ -26,7 +26,8 @@ class cmMakefile;
class cmInstallExportGenerator: public cmInstallGenerator
{
public:
- cmInstallExportGenerator(cmExportSet* exportSet,
+ cmInstallExportGenerator(cmMakefile* mf,
+ 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 68557bd..c714a52 100644
--- a/Source/cmInstallFilesCommand.cxx
+++ b/Source/cmInstallFilesCommand.cxx
@@ -128,7 +128,8 @@ void cmInstallFilesCommand::CreateInstallGenerator() const
cmInstallGenerator::MessageLevel message =
cmInstallGenerator::SelectMessageLevel(this->Makefile);
this->Makefile->AddInstallGenerator(
- new cmInstallFilesGenerator(this->Files,
+ new cmInstallFilesGenerator(this->Makefile,
+ 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 c18b174..addea48 100644
--- a/Source/cmInstallFilesGenerator.cxx
+++ b/Source/cmInstallFilesGenerator.cxx
@@ -18,7 +18,8 @@
//----------------------------------------------------------------------------
cmInstallFilesGenerator
-::cmInstallFilesGenerator(std::vector<std::string> const& files,
+::cmInstallFilesGenerator(cmMakefile* mf,
+ std::vector<std::string> const& files,
const char* dest, bool programs,
const char* file_permissions,
std::vector<std::string> const& configurations,
@@ -26,7 +27,7 @@ cmInstallFilesGenerator
MessageLevel message,
const char* rename,
bool optional):
- cmInstallGenerator(dest, configurations, component, message),
+ cmInstallGenerator(mf, dest, configurations, component, message),
LocalGenerator(0),
Files(files),
FilePermissions(file_permissions),
diff --git a/Source/cmInstallFilesGenerator.h b/Source/cmInstallFilesGenerator.h
index 00b3a79..baf30ae 100644
--- a/Source/cmInstallFilesGenerator.h
+++ b/Source/cmInstallFilesGenerator.h
@@ -20,7 +20,8 @@
class cmInstallFilesGenerator: public cmInstallGenerator
{
public:
- cmInstallFilesGenerator(std::vector<std::string> const& files,
+ cmInstallFilesGenerator(cmMakefile* mf,
+ std::vector<std::string> const& files,
const char* dest, bool programs,
const char* file_permissions,
std::vector<std::string> const& configurations,
diff --git a/Source/cmInstallGenerator.cxx b/Source/cmInstallGenerator.cxx
index 2e1c5f0..fbbce77 100644
--- a/Source/cmInstallGenerator.cxx
+++ b/Source/cmInstallGenerator.cxx
@@ -16,11 +16,13 @@
//----------------------------------------------------------------------------
cmInstallGenerator
-::cmInstallGenerator(const char* destination,
+::cmInstallGenerator(cmMakefile* mf,
+ 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 b8e5b53..d84cf83 100644
--- a/Source/cmInstallGenerator.h
+++ b/Source/cmInstallGenerator.h
@@ -33,7 +33,8 @@ public:
MessageNever
};
- cmInstallGenerator(const char* destination,
+ cmInstallGenerator(cmMakefile* mf,
+ const char* destination,
std::vector<std::string> const& configurations,
const char* component,
MessageLevel message);
@@ -70,6 +71,7 @@ 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 e6fbe88..03322c2 100644
--- a/Source/cmInstallProgramsCommand.cxx
+++ b/Source/cmInstallProgramsCommand.cxx
@@ -91,7 +91,8 @@ void cmInstallProgramsCommand::FinalPass()
cmInstallGenerator::MessageLevel message =
cmInstallGenerator::SelectMessageLevel(this->Makefile);
this->Makefile->AddInstallGenerator(
- new cmInstallFilesGenerator(this->Files,
+ new cmInstallFilesGenerator(this->Makefile,
+ 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 933aa07..9f43f80 100644
--- a/Source/cmInstallScriptGenerator.cxx
+++ b/Source/cmInstallScriptGenerator.cxx
@@ -13,9 +13,11 @@
//----------------------------------------------------------------------------
cmInstallScriptGenerator
-::cmInstallScriptGenerator(const char* script, bool code,
+::cmInstallScriptGenerator(cmMakefile* mf,
+ const char* script, bool code,
const char* component) :
- cmInstallGenerator(0, std::vector<std::string>(), component, MessageDefault),
+ cmInstallGenerator(mf, 0, std::vector<std::string>(),
+ component, MessageDefault),
Script(script), Code(code)
{
}
diff --git a/Source/cmInstallScriptGenerator.h b/Source/cmInstallScriptGenerator.h
index 54a7b21..41dd319 100644
--- a/Source/cmInstallScriptGenerator.h
+++ b/Source/cmInstallScriptGenerator.h
@@ -20,7 +20,9 @@
class cmInstallScriptGenerator: public cmInstallGenerator
{
public:
- cmInstallScriptGenerator(const char* script, bool code,
+ cmInstallScriptGenerator(
+ cmMakefile* mf,
+ const char* script, bool code,
const char* component);
virtual ~cmInstallScriptGenerator();
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 30cf175..7b2893c 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -24,14 +24,15 @@
//----------------------------------------------------------------------------
cmInstallTargetGenerator
-::cmInstallTargetGenerator(const std::string& targetName,
+::cmInstallTargetGenerator(cmMakefile* mf,
+ 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(dest, configurations, component, message),
+ cmInstallGenerator(mf, dest, configurations, component, message),
TargetName(targetName),
Target(0),
FilePermissions(file_permissions),
diff --git a/Source/cmInstallTargetGenerator.h b/Source/cmInstallTargetGenerator.h
index a8f4a75..e6064d1 100644
--- a/Source/cmInstallTargetGenerator.h
+++ b/Source/cmInstallTargetGenerator.h
@@ -24,6 +24,7 @@ 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 6c7b194..dff06b9 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2465,7 +2465,8 @@ public:
cmInstallTargetGeneratorLocal(cmLocalGenerator* lg, std::string const& t,
const char* dest, bool implib):
cmInstallTargetGenerator(
- t, dest, implib, "", std::vector<std::string>(), "Unspecified",
+ lg->GetMakefile(), t, dest, implib, "",
+ std::vector<std::string>(), "Unspecified",
cmInstallGenerator::SelectMessageLevel(lg->GetMakefile()),
false)
{
@@ -2493,7 +2494,7 @@ cmLocalGenerator
// Include the user-specified pre-install script for this target.
if(const char* preinstall = l->second.GetProperty("PRE_INSTALL_SCRIPT"))
{
- cmInstallScriptGenerator g(preinstall, false, 0);
+ cmInstallScriptGenerator g(this->Makefile, preinstall, false, 0);
g.Generate(os, config, configurationTypes);
}
@@ -2554,7 +2555,7 @@ cmLocalGenerator
// Include the user-specified post-install script for this target.
if(const char* postinstall = l->second.GetProperty("POST_INSTALL_SCRIPT"))
{
- cmInstallScriptGenerator g(postinstall, false, 0);
+ cmInstallScriptGenerator g(this->Makefile, 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, 63 insertions(+), 49 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list