[Cmake-commits] CMake branch, next, updated. v2.8.2-732-gec47925

[David Cole]

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  ec4792583b7d7270f56644ad9f532f4b24009db0 (commit)
       via  e79e412e70cb439354df589d83d3878c4dbe62fc (commit)
      from  eb035b65264fbd72f49381a5bdd40f8e1c13da74 (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=ec4792583b7d7270f56644ad9f532f4b24009db0
commit ec4792583b7d7270f56644ad9f532f4b24009db0
Merge: eb035b6 e79e412
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Sep 9 16:53:12 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 9 16:53:12 2010 -0400

    Merge topic 'fix_target_name_with_dot_vs10' into next
    
    e79e412 VS2010: Honor PROJECT_LABEL target property (#10611)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e79e412e70cb439354df589d83d3878c4dbe62fc
commit e79e412e70cb439354df589d83d3878c4dbe62fc
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Sep 9 16:21:57 2010 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Thu Sep 9 16:44:30 2010 -0400

    VS2010: Honor PROJECT_LABEL target property (#10611)

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 477945b..b374579 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -155,6 +155,13 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteString("<Keyword>Win32Proj</Keyword>\n", 2);
   this->WriteString("<Platform>", 2);
   (*this->BuildFileStream) << this->Platform << "</Platform>\n";
+  const char* projLabel = this->Target->GetProperty("PROJECT_LABEL");
+  if(!projLabel)
+    {
+    projLabel = this->Name.c_str();
+    }
+  this->WriteString("<ProjectName>", 2);
+  (*this->BuildFileStream) << projLabel << "</ProjectName>\n";
   this->WriteString("</PropertyGroup>\n", 1);
   this->WriteString("<Import Project="
                     "\"$(VCTargetsPath)\\Microsoft.Cpp.Default.props\" />\n",
diff --git a/Tests/FunctionTest/CMakeLists.txt b/Tests/FunctionTest/CMakeLists.txt
index ef55173..5d4f42d 100644
--- a/Tests/FunctionTest/CMakeLists.txt
+++ b/Tests/FunctionTest/CMakeLists.txt
@@ -166,3 +166,11 @@ ELSE(DEFINED SUBDIR_DEFINED)
 ENDIF(DEFINED SUBDIR_DEFINED)
 
 ADD_EXECUTABLE(FunctionTest functionTest.c)
+
+# Use the PROJECT_LABEL property: in IDEs, the project label should appear
+# in the UI rather than the target name. If this were a good test of the
+# property rather than just a smoke test, it would verify that the label
+# actually appears in the UI of the IDE... Or at least that the text appears
+# somewhere in the generated project files.
+SET_PROPERTY(TARGET miniFunctionTest
+  PROPERTY PROJECT_LABEL "Test de Fonctionnement")

-----------------------------------------------------------------------

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    7 +++++++
 Tests/FunctionTest/CMakeLists.txt          |    8 ++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake