[Cmake-commits] CMake branch, next, updated. v2.8.6-1998-gd7cb90e
Brad King
brad.king at kitware.com
Tue Nov 22 16:02:03 EST 2011
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 d7cb90e1bb3747876c53f2f006d6b5ce5399c22f (commit)
via 614595f2074c57069812b5bb6c3ccb0f067945ce (commit)
from 2e84d8e613c22677e30414c236dd4f106fdc9a97 (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=d7cb90e1bb3747876c53f2f006d6b5ce5399c22f
commit d7cb90e1bb3747876c53f2f006d6b5ce5399c22f
Merge: 2e84d8e 614595f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 22 16:02:00 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 22 16:02:00 2011 -0500
Merge topic 'CheckImportedFileExistenceInConfigDotCMakeFiles' into next
614595f install(EXPORT): Remove leftover export() command changes
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=614595f2074c57069812b5bb6c3ccb0f067945ce
commit 614595f2074c57069812b5bb6c3ccb0f067945ce
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 22 16:00:09 2011 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 22 16:00:09 2011 -0500
install(EXPORT): Remove leftover export() command changes
The implementation of imported file existence verification was
originally done for both install(EXPORT) and export() but the latter was
removed since not all configurations may be available in a build tree.
Remove remnants of the export() implementation.
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 1f8a2e2..7e73e36 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -68,9 +68,7 @@ cmExportBuildFileGenerator
// Collect import properties for this target.
cmTarget* target = *tei;
ImportPropertyMap properties;
- std::set<std::string> importedLocations;
- this->SetImportLocationProperty(config, suffix, target, properties,
- importedLocations);
+ this->SetImportLocationProperty(config, suffix, target, properties);
if(!properties.empty())
{
// Get the rest of the target details.
@@ -87,15 +85,13 @@ cmExportBuildFileGenerator
this->GenerateImportPropertyCode(os, config, target, properties);
}
}
-
}
//----------------------------------------------------------------------------
void
cmExportBuildFileGenerator
::SetImportLocationProperty(const char* config, std::string const& suffix,
- cmTarget* target, ImportPropertyMap& properties,
- std::set<std::string>& importedLocations)
+ cmTarget* target, ImportPropertyMap& properties)
{
// Get the makefile in which to lookup target information.
cmMakefile* mf = target->GetMakefile();
@@ -114,7 +110,6 @@ cmExportBuildFileGenerator
value = target->GetFullPath(config, false, true);
}
properties[prop] = value;
- importedLocations.insert(prop);
}
// Check whether this is a DLL platform.
@@ -131,7 +126,6 @@ cmExportBuildFileGenerator
prop += suffix;
std::string value = target->GetFullPath(config, true);
properties[prop] = value;
- importedLocations.insert(prop);
}
}
diff --git a/Source/cmExportBuildFileGenerator.h b/Source/cmExportBuildFileGenerator.h
index 18be68e..0f37626 100644
--- a/Source/cmExportBuildFileGenerator.h
+++ b/Source/cmExportBuildFileGenerator.h
@@ -52,8 +52,7 @@ protected:
void SetImportLocationProperty(const char* config,
std::string const& suffix,
cmTarget* target,
- ImportPropertyMap& properties,
- std::set<std::string>& importedLocations);
+ ImportPropertyMap& properties);
std::vector<cmTarget*> const* Exports;
cmExportCommand* ExportCommand;
-----------------------------------------------------------------------
Summary of changes:
Source/cmExportBuildFileGenerator.cxx | 10 ++--------
Source/cmExportBuildFileGenerator.h | 3 +--
2 files changed, 3 insertions(+), 10 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list