diff options
| author | David Cole <david.cole@kitware.com> | 2010-09-09 20:21:57 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2010-09-09 20:44:30 (GMT) |
| commit | e79e412e70cb439354df589d83d3878c4dbe62fc (patch) | |
| tree | 21429b189d8130d8e8e8c47b54a6e60ff467cbfa | |
| parent | 530ade6677ec2c12fe8f3db5f5d71ad0ffaa9e68 (diff) | |
| download | CMake-e79e412e70cb439354df589d83d3878c4dbe62fc.zip CMake-e79e412e70cb439354df589d83d3878c4dbe62fc.tar.gz CMake-e79e412e70cb439354df589d83d3878c4dbe62fc.tar.bz2 | |
VS2010: Honor PROJECT_LABEL target property (#10611)
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 7 | ||||
| -rw-r--r-- | Tests/FunctionTest/CMakeLists.txt | 8 |
2 files changed, 15 insertions, 0 deletions
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") |