[Cmake-commits] CMake branch, next, updated. v2.8.11-2049-g4c307e1
Stephen Kelly
steveire at gmail.com
Thu May 16 17:13:00 EDT 2013
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 4c307e1c616df6efbe64d4a96efa4fb2e7296fdf (commit)
via a0886e8bba17d05b9ca503050bd01b8a7af060b9 (commit)
from 990b683596e092867492e501f2bfa9189b2b9610 (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=4c307e1c616df6efbe64d4a96efa4fb2e7296fdf
commit 4c307e1c616df6efbe64d4a96efa4fb2e7296fdf
Merge: 990b683 a0886e8
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 16 17:12:58 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 16 17:12:58 2013 -0400
Merge topic 'add-EXPORT_NAME-property' into next
a0886e8 Revert "Add EXPORT_NAME property."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0886e8bba17d05b9ca503050bd01b8a7af060b9
commit a0886e8bba17d05b9ca503050bd01b8a7af060b9
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 16 23:10:01 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu May 16 23:10:01 2013 +0200
Revert "Add EXPORT_NAME property."
This reverts commit 1cda7beb05a4ff719b44533a8b46ba29f4e2bd19.
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index e1c26c6..7147f86 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -30,7 +30,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
tei = this->Exports->begin();
tei != this->Exports->end(); ++tei)
{
- expectedTargets += sep + this->Namespace + (*tei)->GetExportName();
+ expectedTargets += sep + this->Namespace + (*tei)->GetName();
sep = " ";
cmTarget* te = *tei;
if(this->ExportedTargets.insert(te).second)
@@ -189,7 +189,7 @@ cmExportBuildFileGenerator::HandleMissingTarget(
// Assume the target will be exported by another command.
// Append it with the export namespace.
link_libs += this->Namespace;
- link_libs += dependee->GetExportName();
+ link_libs += dependee->GetName();
}
//----------------------------------------------------------------------------
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index a6ccbd5..27ec56b 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -376,7 +376,7 @@ void cmExportFileGenerator::GenerateInterfaceProperties(cmTarget *target,
if (!properties.empty())
{
std::string targetName = this->Namespace;
- targetName += target->GetExportName();
+ targetName += target->GetName();
os << "set_target_properties(" << targetName << " PROPERTIES\n";
for(ImportPropertyMap::const_iterator pi = properties.begin();
pi != properties.end(); ++pi)
@@ -407,7 +407,7 @@ cmExportFileGenerator::AddTargetNamespace(std::string &input,
}
if(this->ExportedTargets.find(tgt) != this->ExportedTargets.end())
{
- input = this->Namespace + tgt->GetExportName();
+ input = this->Namespace + input;
}
else
{
@@ -772,8 +772,7 @@ cmExportFileGenerator
{
// Construct the imported target name.
std::string targetName = this->Namespace;
-
- targetName += target->GetExportName();
+ targetName += target->GetName();
// Create the imported target.
os << "# Create imported target " << targetName << "\n";
@@ -836,8 +835,7 @@ cmExportFileGenerator
{
// Construct the imported target name.
std::string targetName = this->Namespace;
-
- targetName += target->GetExportName();
+ targetName += target->GetName();
// Set the import properties.
os << "# Import target \"" << targetName << "\" for configuration \""
@@ -956,7 +954,7 @@ cmExportFileGenerator
{
// Construct the imported target name.
std::string targetName = this->Namespace;
- targetName += target->GetExportName();
+ targetName += target->GetName();
os << "list(APPEND _IMPORT_CHECK_TARGETS " << targetName << " )\n"
"list(APPEND _IMPORT_CHECK_FILES_FOR_" << targetName << " ";
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index e54dfd1..ad12b5a 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -47,7 +47,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
tei = this->IEGen->GetExportSet()->GetTargetExports()->begin();
tei != this->IEGen->GetExportSet()->GetTargetExports()->end(); ++tei)
{
- expectedTargets += sep + this->Namespace + (*tei)->Target->GetExportName();
+ expectedTargets += sep + this->Namespace + (*tei)->Target->GetName();
sep = " ";
cmTargetExport const* te = *tei;
if(this->ExportedTargets.insert(te->Target).second)
@@ -401,8 +401,7 @@ cmExportInstallFileGenerator::HandleMissingTarget(
if (targetOccurrences == 1)
{
std::string missingTarget = namespaces[0];
-
- missingTarget += dependee->GetExportName();
+ missingTarget += name;
link_libs += missingTarget;
missingTargets.push_back(missingTarget);
}
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 4db9e91..d14bfca 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -867,13 +867,6 @@ void cmTarget::DefineProperties(cmake *cm)
"OSX_ARCHITECTURES.");
cm->DefineProperty
- ("EXPORT_NAME", cmProperty::TARGET,
- "Exported name for target files.",
- "This sets the name for the IMPORTED target generated when it this "
- "target is is exported. "
- "If not set, the logical target name is used by default.");
-
- cm->DefineProperty
("OUTPUT_NAME", cmProperty::TARGET,
"Output name for target files.",
"This sets the base name for output files created for an executable or "
@@ -2777,26 +2770,6 @@ void cmTarget::AppendProperty(const char* prop, const char* value,
}
//----------------------------------------------------------------------------
-const char* cmTarget::GetExportName()
-{
- const char *exportName = this->GetProperty("EXPORT_NAME");
-
- if (exportName && *exportName)
- {
- if (!cmGeneratorExpression::IsValidTargetName(exportName))
- {
- cmOStringStream e;
- e << "EXPORT_NAME property \"" << exportName << "\" for \""
- << this->GetName() << "\": is not valid.";
- cmSystemTools::Error(e.str().c_str());
- return "";
- }
- return exportName;
- }
- return this->GetName();
-}
-
-//----------------------------------------------------------------------------
void cmTarget::AppendBuildInterfaceIncludes()
{
if(this->GetType() != cmTarget::SHARED_LIBRARY &&
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 42a31db..9d46796 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -85,7 +85,6 @@ public:
///! Set/Get the name of the target
const char* GetName() const {return this->Name.c_str();}
- const char* GetExportName();
///! Set the cmMakefile that owns this target
void SetMakefile(cmMakefile *mf);
diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt
index 69452c5..be48483 100644
--- a/Tests/ExportImport/Export/CMakeLists.txt
+++ b/Tests/ExportImport/Export/CMakeLists.txt
@@ -165,8 +165,6 @@ set_property(TARGET testLibRequired APPEND PROPERTY
include(GenerateExportHeader)
-add_subdirectory(renamed)
-
add_library(testSharedLibRequired SHARED testSharedLibRequired.cpp)
generate_export_header(testSharedLibRequired)
set_property(TARGET testSharedLibRequired
@@ -228,7 +226,6 @@ set_property(TARGET testSharedLibDepends APPEND PROPERTY
# LINK_PRIVATE because the LINK_INTERFACE_LIBRARIES is specified above.
target_link_libraries(testSharedLibDepends LINK_PRIVATE testSharedLibRequired)
-target_link_libraries(testSharedLibDepends LINK_PUBLIC renamed_on_export)
install(TARGETS testLibRequired
testLibIncludeRequired1
@@ -313,7 +310,7 @@ add_subdirectory(sublib) # For CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE test.
# Export from build tree.
export(TARGETS testExe1 testLib1 testLib2 testLib3
testExe2libImp testLib3Imp testLib3ImpDep subdirlib
- testSharedLibRequired testSharedLibDepends renamed_on_export
+ testSharedLibRequired testSharedLibDepends
NAMESPACE bld_
FILE ExportBuildTree.cmake
)
diff --git a/Tests/ExportImport/Export/renamed/CMakeLists.txt b/Tests/ExportImport/Export/renamed/CMakeLists.txt
deleted file mode 100644
index a763251..0000000
--- a/Tests/ExportImport/Export/renamed/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-
-add_library(renamed_on_export SHARED renamed.cxx)
-generate_export_header(renamed_on_export)
-target_include_directories(renamed_on_export
- PUBLIC "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/renamed>"
- "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}>"
-)
-set_property(TARGET renamed_on_export
- PROPERTY
- EXPORT_NAME renamed
-)
-
-install(FILES
- "${CMAKE_CURRENT_SOURCE_DIR}/renamed.h"
- "${CMAKE_CURRENT_BINARY_DIR}/renamed_on_export_export.h"
- DESTINATION include/renamed
-)
-
-install(TARGETS renamed_on_export
- EXPORT exp DESTINATION lib )
diff --git a/Tests/ExportImport/Export/renamed/renamed.cxx b/Tests/ExportImport/Export/renamed/renamed.cxx
deleted file mode 100644
index b3e3e7e..0000000
--- a/Tests/ExportImport/Export/renamed/renamed.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#include "renamed.h"
-
-int Renamed::foo()
-{
- return 0;
-}
diff --git a/Tests/ExportImport/Export/renamed/renamed.h b/Tests/ExportImport/Export/renamed/renamed.h
deleted file mode 100644
index 06ac601..0000000
--- a/Tests/ExportImport/Export/renamed/renamed.h
+++ /dev/null
@@ -1,12 +0,0 @@
-
-#ifndef RENAMED_H
-#define RENAMED_H
-
-#include "renamed_on_export_export.h"
-
-struct RENAMED_ON_EXPORT_EXPORT Renamed
-{
- int foo();
-};
-
-#endif
diff --git a/Tests/ExportImport/Export/testSharedLibDepends.cpp b/Tests/ExportImport/Export/testSharedLibDepends.cpp
index 962223f..e279207 100644
--- a/Tests/ExportImport/Export/testSharedLibDepends.cpp
+++ b/Tests/ExportImport/Export/testSharedLibDepends.cpp
@@ -4,6 +4,5 @@
int TestSharedLibDepends::foo()
{
TestSharedLibRequired req;
- Renamed renamed;
- return req.foo() + renamed.foo();
+ return req.foo();
}
diff --git a/Tests/ExportImport/Export/testSharedLibDepends.h b/Tests/ExportImport/Export/testSharedLibDepends.h
index 8b2f84e..b93143a 100644
--- a/Tests/ExportImport/Export/testSharedLibDepends.h
+++ b/Tests/ExportImport/Export/testSharedLibDepends.h
@@ -5,7 +5,6 @@
#include "testsharedlibdepends_export.h"
#include "testSharedLibRequired.h"
-#include "renamed.h"
struct TESTSHAREDLIBDEPENDS_EXPORT TestSharedLibDepends
{
diff --git a/Tests/ExportImport/Import/A/CMakeLists.txt b/Tests/ExportImport/Import/A/CMakeLists.txt
index 65b1a36..0337130 100644
--- a/Tests/ExportImport/Import/A/CMakeLists.txt
+++ b/Tests/ExportImport/Import/A/CMakeLists.txt
@@ -183,12 +183,6 @@ else()
endif()
endif()
-add_executable(exp_renamed_test renamed_test.cpp)
-target_link_libraries(exp_renamed_test exp_renamed)
-
-add_executable(bld_renamed_test renamed_test.cpp)
-target_link_libraries(bld_renamed_test bld_renamed)
-
if (run_pic_test)
target_compile_definitions(deps_shared_iface PRIVATE CHECK_PIC_WORKS)
endif()
diff --git a/Tests/ExportImport/Import/A/deps_shared_iface.cpp b/Tests/ExportImport/Import/A/deps_shared_iface.cpp
index 32e04db..2f0e74a 100644
--- a/Tests/ExportImport/Import/A/deps_shared_iface.cpp
+++ b/Tests/ExportImport/Import/A/deps_shared_iface.cpp
@@ -22,7 +22,6 @@
#ifdef TEST_SUBDIR_LIB
#include "subdir.h"
-#include "renamed.h"
#endif
int main(int,char **)
@@ -32,12 +31,11 @@ int main(int,char **)
#ifdef TEST_SUBDIR_LIB
SubDirObject sdo;
- Renamed ren;
#endif
return dep.foo() + req.foo()
#ifdef TEST_SUBDIR_LIB
- + sdo.foo() + ren.foo()
+ + sdo.foo()
#endif
;
}
diff --git a/Tests/ExportImport/Import/A/renamed_test.cpp b/Tests/ExportImport/Import/A/renamed_test.cpp
deleted file mode 100644
index e2ee126..0000000
--- a/Tests/ExportImport/Import/A/renamed_test.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-
-#include "renamed.h"
-
-int main(int, char **)
-{
- Renamed ren;
- return ren.foo();
-}
-----------------------------------------------------------------------
Summary of changes:
Source/cmExportBuildFileGenerator.cxx | 4 +-
Source/cmExportFileGenerator.cxx | 12 +++-----
Source/cmExportInstallFileGenerator.cxx | 5 +--
Source/cmTarget.cxx | 27 --------------------
Source/cmTarget.h | 1 -
Tests/ExportImport/Export/CMakeLists.txt | 5 +---
Tests/ExportImport/Export/renamed/CMakeLists.txt | 20 --------------
Tests/ExportImport/Export/renamed/renamed.cxx | 7 -----
Tests/ExportImport/Export/renamed/renamed.h | 12 ---------
Tests/ExportImport/Export/testSharedLibDepends.cpp | 3 +-
Tests/ExportImport/Export/testSharedLibDepends.h | 1 -
Tests/ExportImport/Import/A/CMakeLists.txt | 6 ----
Tests/ExportImport/Import/A/deps_shared_iface.cpp | 4 +--
Tests/ExportImport/Import/A/renamed_test.cpp | 8 ------
14 files changed, 12 insertions(+), 103 deletions(-)
delete mode 100644 Tests/ExportImport/Export/renamed/CMakeLists.txt
delete mode 100644 Tests/ExportImport/Export/renamed/renamed.cxx
delete mode 100644 Tests/ExportImport/Export/renamed/renamed.h
delete mode 100644 Tests/ExportImport/Import/A/renamed_test.cpp
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list