[Cmake-commits] CMake branch, master, updated. v2.8.10.2-632-g7dab997
Brad King
brad.king at kitware.com
Fri Feb 8 13:38:59 EST 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 7dab997771e4f496fd71a4e9c3abc26063c57c68 (commit)
via 56ca8d4e6365d67901e0cff7f2bd99f174537a97 (commit)
via f36c665df80e8e3f4eca0fed28b5d1c3df739552 (commit)
via c0debb1f89de47f13f7b9682ebd24b772a649e78 (commit)
via daae0d2f5b0f9f5e1db3615d85d39ee819d50175 (commit)
via e3841cf4a275a65ea6306e980da7dfef78a8c57d (commit)
via f980a8049522782779b3a721c37f976de1e38dcc (commit)
via 650c6471600fa8b06ed343ff3a4f3d16a3dc95bc (commit)
via 4fd534295642b1c08c72229d705db6c7265ecd28 (commit)
via 118c32f8f211b0bb9a096fbb0711cacf2b68f057 (commit)
via cf8645e82dbb7dff434b14bd127c5457745e4db8 (commit)
via 5b2fba5d402246bebc6d89573fbc4bb6192ccf8b (commit)
from 2cd362d19114e4b8a85c3c5179734d12416f4d72 (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=7dab997771e4f496fd71a4e9c3abc26063c57c68
commit 7dab997771e4f496fd71a4e9c3abc26063c57c68
Merge: 2cd362d 56ca8d4
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 8 13:38:56 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 8 13:38:56 2013 -0500
Merge topic 'generator-toolset'
56ca8d4 Tests: Add generator toolset support
f36c665 Tests: Consolidate ctest --build-and-test generator options
c0debb1 Merge branch 'master' into generator-toolset
daae0d2 ExternalProject: Propagate the generator toolset
e3841cf CTest: Add options to set generator toolset
f980a80 Xcode: Implement generator toolset selection (#9831, #13802)
650c647 VS: Implement generator toolset selection (#10722, #13774)
4fd5342 CMake: Add -T option to choose a generator toolset
118c32f Merge branch 'xcode-duplicate-flags-13354' into generator-toolset
cf8645e Tests: Run ctest custom commands with VERBATIM
5b2fba5 ExternalProject: Simplify CMake command line generation
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 2 +
Modules/CMakeDetermineCompilerId.cmake | 5 +
Modules/CompilerId/Xcode-3.pbxproj.in | 1 +
Modules/ExternalProject.cmake | 20 ++-
Source/CTest/cmCTestBuildAndTestHandler.cxx | 24 ++-
Source/CTest/cmCTestBuildAndTestHandler.h | 1 +
Source/CTest/cmCTestConfigureCommand.cxx | 9 +
Source/cmDocumentVariables.cxx | 17 ++
Source/cmGlobalGenerator.cxx | 14 ++
Source/cmGlobalGenerator.h | 4 +
Source/cmGlobalVisualStudio10Generator.cxx | 8 +
Source/cmGlobalVisualStudio10Generator.h | 2 +
Source/cmGlobalXCodeGenerator.cxx | 24 ++
Source/cmGlobalXCodeGenerator.h | 2 +
Source/cmMakefile.cxx | 1 +
Source/cmake.cxx | 55 +++++
Source/cmake.h | 16 ++
Source/ctest.cxx | 1 +
Tests/CMakeBuildTest.cmake.in | 1 +
Tests/CMakeLists.txt | 233 ++++++++------------
Tests/CMakeOnly/Test.cmake.in | 1 +
Tests/CTestConfig/dashboard.cmake.in | 5 +-
Tests/CTestConfig/script.cmake.in | 1 +
Tests/CTestTest/test.cmake.in | 1 +
Tests/CTestTest2/test.cmake.in | 1 +
Tests/CTestTestBadExe/test.cmake.in | 1 +
Tests/CTestTestChecksum/test.cmake.in | 1 +
Tests/CTestTestConfigFileInBuildDir/test1.cmake.in | 1 +
Tests/CTestTestConfigFileInBuildDir/test2.cmake.in | 1 +
Tests/CTestTestCostSerial/test.cmake.in | 1 +
Tests/CTestTestCrash/test.cmake.in | 1 +
Tests/CTestTestCycle/test.cmake.in | 1 +
Tests/CTestTestDepends/test.cmake.in | 1 +
Tests/CTestTestFailedSubmits/test.cmake.in | 1 +
Tests/CTestTestFailure/testNoBuild.cmake.in | 1 +
Tests/CTestTestFailure/testNoExe.cmake.in | 1 +
Tests/CTestTestMemcheck/DummyBC/test.cmake.in | 1 +
Tests/CTestTestMemcheck/DummyPurify/test.cmake.in | 1 +
.../CTestTestMemcheck/DummyValgrind/test.cmake.in | 1 +
.../DummyValgrindFailPost/test.cmake.in | 1 +
.../DummyValgrindFailPre/test.cmake.in | 1 +
.../DummyValgrindIgnoreMemcheck/test.cmake.in | 1 +
.../DummyValgrindPrePost/test.cmake.in | 1 +
Tests/CTestTestMemcheck/NotExist/test.cmake.in | 1 +
Tests/CTestTestMemcheck/Unknown/test.cmake.in | 1 +
.../CTestTestMemcheck/UnknownQuoted/test.cmake.in | 1 +
Tests/CTestTestParallel/test.cmake.in | 1 +
Tests/CTestTestResourceLock/test.cmake.in | 1 +
Tests/CTestTestScheduler/test.cmake.in | 1 +
Tests/CTestTestStopTime/test.cmake.in | 1 +
Tests/CTestTestSubdir/test.cmake.in | 1 +
Tests/CTestTestTimeout/test.cmake.in | 1 +
Tests/CTestTestUpload/test.cmake.in | 1 +
Tests/CTestTestZeroTimeout/test.cmake.in | 1 +
Tests/ExportImport/CMakeLists.txt | 8 +-
.../ExternalProjectUpdateTest.cmake | 2 +-
Tests/Fortran/CMakeLists.txt | 4 +-
Tests/FortranC/Flags.cmake.in | 1 +
Tests/RunCMake/CMakeLists.txt | 7 +
.../BadToolset-result.txt} | 0
.../GeneratorToolset/BadToolset-stderr.txt | 10 +
Tests/RunCMake/GeneratorToolset/BadToolset.cmake | 1 +
.../{CMP0004 => GeneratorToolset}/CMakeLists.txt | 0
.../NoToolset-result.txt} | 0
.../RunCMake/GeneratorToolset/NoToolset-stderr.txt | 4 +
Tests/RunCMake/GeneratorToolset/NoToolset.cmake | 7 +
Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake | 17 ++
.../TestToolset-result.txt} | 0
.../GeneratorToolset/TestToolset-stderr.txt | 4 +
Tests/RunCMake/GeneratorToolset/TestToolset.cmake | 7 +
.../TwoToolsets-result.txt} | 0
.../GeneratorToolset/TwoToolsets-stderr.txt | 1 +
Tests/RunCMake/GeneratorToolset/TwoToolsets.cmake | 1 +
Tests/RunCMake/RunCMake.cmake | 8 +-
Tests/VSExternalInclude/CMakeLists.txt | 18 +-
75 files changed, 413 insertions(+), 165 deletions(-)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorToolset/BadToolset-result.txt} (100%)
create mode 100644 Tests/RunCMake/GeneratorToolset/BadToolset-stderr.txt
create mode 100644 Tests/RunCMake/GeneratorToolset/BadToolset.cmake
copy Tests/RunCMake/{CMP0004 => GeneratorToolset}/CMakeLists.txt (100%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorToolset/NoToolset-result.txt} (100%)
create mode 100644 Tests/RunCMake/GeneratorToolset/NoToolset-stderr.txt
create mode 100644 Tests/RunCMake/GeneratorToolset/NoToolset.cmake
create mode 100644 Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorToolset/TestToolset-result.txt} (100%)
create mode 100644 Tests/RunCMake/GeneratorToolset/TestToolset-stderr.txt
create mode 100644 Tests/RunCMake/GeneratorToolset/TestToolset.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorToolset/TwoToolsets-result.txt} (100%)
create mode 100644 Tests/RunCMake/GeneratorToolset/TwoToolsets-stderr.txt
create mode 100644 Tests/RunCMake/GeneratorToolset/TwoToolsets.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list