[Cmake-commits] CMake branch, master, updated. v2.8.11-23-ge117847
Brad King
brad.king at kitware.com
Thu May 16 14:36:28 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, master has been updated
via e1178478b7fa89770c1aef31558d37f049afeafd (commit)
via ac9a5f4d943685f0b49b1a9d03f4e23238df0867 (commit)
via a6c0299c407bc4482140637c0460f71238b4f9d0 (commit)
via 1ca93182ad37f6f90ceb0b2a5faaa21ef58ba7e2 (commit)
via 3cd400060162a0069d5798ce8dc33f0507594938 (commit)
via df035e4825189c0d4d9519160d439e7f96a39086 (commit)
via de8be9ef7d019023099d28a1f797698ed7b598bd (commit)
from 5386aaecd4befd35d404b7b465bf7a26099f62a2 (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=e1178478b7fa89770c1aef31558d37f049afeafd
commit e1178478b7fa89770c1aef31558d37f049afeafd
Merge: 5386aae ac9a5f4
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu May 16 14:36:27 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 16 14:36:27 2013 -0400
Merge topic 'msbuild-targets-in-subdirs'
ac9a5f4 ctest_build: Pass projectDir to GenerateBuildCommand
a6c0299 CTest: Simplify ctest_* command source/build dir lookup
1ca9318 VS: Add test for building MSBuild project in subdir
3cd4000 VS: Use .sln parser to build targets in subdirs with msbuild (#13623)
df035e4 VS: Create parser for Visual Studio .sln files
de8be9e Add projectDir parameter to GenerateBuildCommand
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeLists.txt | 4 +
Source/CPack/cmCPackGenerator.cxx | 2 +-
Source/CTest/cmCTestBuildCommand.cxx | 3 +-
Source/CTest/cmCTestConfigureCommand.cxx | 26 -
Source/CTest/cmCTestHandlerCommand.cxx | 27 +-
Source/cmBuildCommand.cxx | 4 +-
Source/cmGlobalGenerator.cxx | 12 +-
Source/cmGlobalGenerator.h | 7 +-
Source/cmGlobalNinjaGenerator.cxx | 4 +-
Source/cmGlobalNinjaGenerator.h | 1 +
Source/cmGlobalUnixMakefileGenerator3.cxx | 8 +-
Source/cmGlobalUnixMakefileGenerator3.h | 3 +-
Source/cmGlobalVisualStudio10Generator.cxx | 40 +-
Source/cmGlobalVisualStudio10Generator.h | 2 +-
Source/cmGlobalVisualStudio6Generator.cxx | 3 +
Source/cmGlobalVisualStudio6Generator.h | 1 +
Source/cmGlobalVisualStudio7Generator.cxx | 4 +-
Source/cmGlobalVisualStudio7Generator.h | 1 +
Source/cmGlobalXCodeGenerator.cxx | 2 +
Source/cmGlobalXCodeGenerator.h | 1 +
Source/cmVisualStudioSlnData.cxx | 62 ++
Source/cmVisualStudioSlnData.h | 58 ++
Source/cmVisualStudioSlnParser.cxx | 712 ++++++++++++++++++++
Source/cmVisualStudioSlnParser.h | 118 ++++
Tests/CMakeLib/CMakeLists.txt | 8 +
Tests/CMakeLib/testVisualStudioSlnParser.cxx | 185 +++++
Tests/CMakeLib/testVisualStudioSlnParser.h.in | 7 +
.../testVisualStudioSlnParser_data/.gitattributes | 1 +
.../testVisualStudioSlnParser_data/bom.sln-file | 2 +
.../err-data.sln-file | 6 +
.../err-empty.sln-file | 0
.../err-structure-global.sln-file | 9 +
.../err-structure-header.sln-file | 4 +
.../err-structure-projectArgs.sln-file | 4 +
.../err-structure-projectContents.sln-file | 6 +
.../err-structure-projectSection.sln-file | 11 +
.../err-structure-strayParen.sln-file | 4 +
.../err-structure-strayQuote.sln-file | 4 +
.../err-structure-strayQuote2.sln-file | 4 +
.../err-structure-topLevel.sln-file | 4 +
.../err-structure-unclosed.sln-file | 5 +
.../testVisualStudioSlnParser_data/nobom.sln-file | 2 +
.../testVisualStudioSlnParser_data/valid.sln-file | 680 +++++++++++++++++++
Tests/CMakeLists.txt | 37 +
.../CTestBuildCommandProjectInSubdir.cmake.in | 12 +
Tests/VSProjectInSubdir/CMakeLists.txt | 3 +
Tests/VSProjectInSubdir/subdir/CMakeLists.txt | 1 +
47 files changed, 2042 insertions(+), 62 deletions(-)
create mode 100644 Source/cmVisualStudioSlnData.cxx
create mode 100644 Source/cmVisualStudioSlnData.h
create mode 100644 Source/cmVisualStudioSlnParser.cxx
create mode 100644 Source/cmVisualStudioSlnParser.h
create mode 100644 Tests/CMakeLib/testVisualStudioSlnParser.cxx
create mode 100644 Tests/CMakeLib/testVisualStudioSlnParser.h.in
create mode 100644 Tests/CMakeLib/testVisualStudioSlnParser_data/.gitattributes
create mode 100644 Tests/CMakeLib/testVisualStudioSlnParser_data/bom.sln-file
create mode 100644 Tests/CMakeLib/testVisualStudioSlnParser_data/err-data.sln-file
copy Modules/IntelVSImplicitPath/hello.f => Tests/CMakeLib/testVisualStudioSlnParser_data/err-empty.sln-file (100%)
create mode 100644 Tests/CMakeLib/testVisualStudioSlnParser_data/err-structure-global.sln-file
create mode 100644 Tests/CMakeLib/testVisualStudioSlnParser_data/err-structure-header.sln-file
create mode 100644 Tests/CMakeLib/testVisualStudioSlnParser_data/err-structure-projectArgs.sln-file
create mode 100644 Tests/CMakeLib/testVisualStudioSlnParser_data/err-structure-projectContents.sln-file
create mode 100644 Tests/CMakeLib/testVisualStudioSlnParser_data/err-structure-projectSection.sln-file
create mode 100644 Tests/CMakeLib/testVisualStudioSlnParser_data/err-structure-strayParen.sln-file
create mode 100644 Tests/CMakeLib/testVisualStudioSlnParser_data/err-structure-strayQuote.sln-file
create mode 100644 Tests/CMakeLib/testVisualStudioSlnParser_data/err-structure-strayQuote2.sln-file
create mode 100644 Tests/CMakeLib/testVisualStudioSlnParser_data/err-structure-topLevel.sln-file
create mode 100644 Tests/CMakeLib/testVisualStudioSlnParser_data/err-structure-unclosed.sln-file
create mode 100644 Tests/CMakeLib/testVisualStudioSlnParser_data/nobom.sln-file
create mode 100644 Tests/CMakeLib/testVisualStudioSlnParser_data/valid.sln-file
create mode 100644 Tests/CTestBuildCommandProjectInSubdir/CTestBuildCommandProjectInSubdir.cmake.in
create mode 100644 Tests/VSProjectInSubdir/CMakeLists.txt
create mode 100644 Tests/VSProjectInSubdir/subdir/CMakeLists.txt
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list