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 ae9934e178647216050a770efef9e81814f8ef0b (commit) via 530ade6677ec2c12fe8f3db5f5d71ad0ffaa9e68 (commit) from ff333f6e03771286133629c6800d317f9e558e31 (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=ae9934e178647216050a770efef9e81814f8ef0b commit ae9934e178647216050a770efef9e81814f8ef0b Merge: ff333f6 530ade6 Author: Bill Hoffman <bill.hoff...@kitware.com> AuthorDate: Mon Sep 6 12:11:24 2010 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Sep 6 12:11:24 2010 -0400 Merge topic 'fix_target_name_with_dot_vs10' into next 530ade6 Fix targets with . in the name for VS 10 IDE. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=530ade6677ec2c12fe8f3db5f5d71ad0ffaa9e68 commit 530ade6677ec2c12fe8f3db5f5d71ad0ffaa9e68 Author: Bill Hoffman <bill.hoff...@kitware.com> AuthorDate: Mon Sep 6 12:06:43 2010 -0400 Commit: Bill Hoffman <bill.hoff...@kitware.com> CommitDate: Mon Sep 6 12:06:43 2010 -0400 Fix targets with . in the name for VS 10 IDE. 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) ----------------------------------------------------------------------- Summary of changes: Source/cmVisualStudio10TargetGenerator.cxx | 5 ++--- Tests/CxxOnly/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits