summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2010-09-06 16:06:43 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2010-09-06 16:06:43 (GMT)
commit530ade6677ec2c12fe8f3db5f5d71ad0ffaa9e68 (patch)
treeb3c22b69448b092f795879bbb253926eed5052ae
parentd26cd46989b4e1170cbebc97ae3b6b30395158db (diff)
downloadCMake-530ade6677ec2c12fe8f3db5f5d71ad0ffaa9e68.zip
CMake-530ade6677ec2c12fe8f3db5f5d71ad0ffaa9e68.tar.gz
CMake-530ade6677ec2c12fe8f3db5f5d71ad0ffaa9e68.tar.bz2
Fix targets with . in the name for VS 10 IDE.
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx5
-rw-r--r--Tests/CxxOnly/CMakeLists.txt4
2 files changed, 4 insertions, 5 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 70680ad..477945b 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -838,10 +838,10 @@ void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
*this->BuildFileStream << intermediateDir
<< "</IntDir>\n";
this->WritePlatformConfigTag("TargetName", config->c_str(), 3);
- *this->BuildFileStream << cmSystemTools::GetFilenameWithoutExtension(
+ *this->BuildFileStream
+ << cmSystemTools::GetFilenameWithoutLastExtension(
targetNameFull.c_str())
<< "</TargetName>\n";
-
this->WritePlatformConfigTag("TargetExt", config->c_str(), 3);
*this->BuildFileStream << cmSystemTools::GetFilenameLastExtension(
targetNameFull.c_str())
@@ -849,7 +849,6 @@ void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
this->OutputLinkIncremental(*config);
}
this->WriteString("</PropertyGroup>\n", 2);
-
}
diff --git a/Tests/CxxOnly/CMakeLists.txt b/Tests/CxxOnly/CMakeLists.txt
index 8258eb4..0b2c1c5 100644
--- a/Tests/CxxOnly/CMakeLists.txt
+++ b/Tests/CxxOnly/CMakeLists.txt
@@ -2,7 +2,7 @@
project (CxxOnly CXX)
set(CMAKE_DEBUG_POSTFIX "_test_debug_postfix")
-add_library(testcxx1 STATIC libcxx1.cxx test.CPP)
+add_library(testcxx1.my STATIC libcxx1.cxx test.CPP)
add_library(testcxx2 SHARED libcxx2.cxx)
add_executable (CxxOnly cxxonly.cxx)
-target_link_libraries(CxxOnly testcxx1 testcxx2)
+target_link_libraries(CxxOnly testcxx1.my testcxx2)