[Cmake-commits] CMake branch, master, updated. v3.0.1-1860-g0a92b23
Brad King
brad.king at kitware.com
Wed Sep 10 11:23:23 EDT 2014
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 0a92b23c52675bf8fe93cb9959266a49ab509ac1 (commit)
via 09c8ad99433df06ed36791bfaef97996cd2de04e (commit)
via 09ab207c668deadea3635a20812fa2f478c17f9f (commit)
via 6944997bd6aa69fdf88f8e4e154e68d57195b20b (commit)
via 8d332091702f34fd1e6c1554f137ac6d85b15dc8 (commit)
via b97736a23d5d83eb65b6ee0b0429ada9fb331c12 (commit)
via 0f1f1271e6ddcea9074afe79685a731d4295c1f5 (commit)
via 4f7d0c421abf047c052cb8d459c8249310cf4f3a (commit)
via 68d4280ac4cb692b908620884b0842b7a01debeb (commit)
via ad2a4776aa34c84a069a9e4d83ea32174ac6e6ac (commit)
via 03b7b6cda1016dd16491f8051b45a5baa85f2282 (commit)
from 2bfe48d6af963472fbd4073f729669306eccac69 (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=0a92b23c52675bf8fe93cb9959266a49ab509ac1
commit 0a92b23c52675bf8fe93cb9959266a49ab509ac1
Merge: 2bfe48d 09c8ad9
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 10 11:23:22 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 10 11:23:22 2014 -0400
Merge topic 'vs-generator-platform'
09c8ad99 enable_language: Initialize system-specific generator info only once
09ab207c Tests: Add generator platform support
6944997b ExternalProject: Propagate the generator platform
8d332091 CTest: Add options to set generator platform
b97736a2 VS: Implement CMAKE_GENERATOR_PLATFORM for VS >= 8
0f1f1271 CMake: Add CMAKE_GENERATOR_PLATFORM option
4f7d0c42 Help: Document CMAKE_VS_PLATFORM_NAME variable
68d4280a VS: Refactor internal default platform name selection
ad2a4776 cmGlobalVisualStudio10Generator: Re-order some methods
03b7b6cd cmGlobalGenerator: Call SetGeneratorToolset even for empty toolset
-----------------------------------------------------------------------
Summary of changes:
Help/generator/Visual Studio 10 2010.rst | 17 ++--
Help/generator/Visual Studio 11 2012.rst | 18 ++++-
Help/generator/Visual Studio 12 2013.rst | 15 +++-
Help/generator/Visual Studio 14.rst | 15 +++-
Help/generator/Visual Studio 8 2005.rst | 14 +++-
Help/generator/Visual Studio 9 2008.rst | 18 ++++-
Help/manual/cmake-variables.7.rst | 2 +
Help/manual/ctest.1.rst | 3 +
Help/release/dev/vs-generator-platform.rst | 7 ++
Help/variable/CMAKE_GENERATOR_PLATFORM.rst | 13 +++
Help/variable/CMAKE_VS_PLATFORM_NAME.rst | 7 ++
Modules/ExternalProject.cmake | 11 +++
Source/CTest/cmCTestBuildAndTestHandler.cxx | 13 +++
Source/CTest/cmCTestBuildAndTestHandler.h | 1 +
Source/CTest/cmCTestConfigureCommand.cxx | 9 +++
Source/cmGlobalGenerator.cxx | 85 ++++++++++++++------
Source/cmGlobalGenerator.h | 4 +
Source/cmGlobalVisualStudio10Generator.cxx | 50 ++++++------
Source/cmGlobalVisualStudio10Generator.h | 4 +-
Source/cmGlobalVisualStudio7Generator.cxx | 31 +++++--
Source/cmGlobalVisualStudio7Generator.h | 7 +-
Source/cmGlobalVisualStudio8Generator.cxx | 15 ++++
Source/cmGlobalVisualStudio8Generator.h | 2 +
Source/cmGlobalXCodeGenerator.cxx | 7 +-
Source/cmMakefile.cxx | 1 +
Source/cmake.cxx | 28 +++++++
Source/cmake.h | 9 +++
Source/ctest.cxx | 1 +
Tests/CMakeBuildTest.cmake.in | 1 +
Tests/CMakeLists.txt | 15 ++++
Tests/CMakeOnly/Test.cmake.in | 1 +
Tests/CTestConfig/dashboard.cmake.in | 1 +
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/CTestTestBadGenerator/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/CTestTestFdSetSize/test.cmake.in | 1 +
Tests/CTestTestLaunchers/test.cmake.in | 1 +
Tests/CTestTestMemcheck/test.cmake.in | 1 +
Tests/CTestTestParallel/test.cmake.in | 1 +
Tests/CTestTestResourceLock/test.cmake.in | 1 +
Tests/CTestTestScheduler/test.cmake.in | 1 +
Tests/CTestTestSkipReturnCode/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 | 2 +
.../ExternalProjectUpdateTest.cmake | 1 +
Tests/Fortran/CMakeLists.txt | 1 +
Tests/FortranC/Flags.cmake.in | 1 +
Tests/MacRuntimePath/CMakeLists.txt | 2 +
Tests/RunCMake/CMakeLists.txt | 2 +
.../BadPlatform-result.txt} | 0
.../BadPlatform-stderr.txt} | 4 +-
.../BadPlatform.cmake} | 0
.../{CMP0004 => GeneratorPlatform}/CMakeLists.txt | 0
.../NoPlatform-result.txt} | 0
.../GeneratorPlatform/NoPlatform-stderr.txt | 4 +
Tests/RunCMake/GeneratorPlatform/NoPlatform.cmake | 7 ++
.../RunCMake/GeneratorPlatform/RunCMakeTest.cmake | 12 +++
.../GeneratorPlatform/x64Platform-stdout.txt | 2 +
Tests/RunCMake/GeneratorPlatform/x64Platform.cmake | 7 ++
Tests/RunCMake/RunCMake.cmake | 1 +
.../include_external_msproject/check_utils.cmake | 4 +-
Tests/StagingPrefix/CMakeLists.txt | 2 +
Tests/VSExternalInclude/CMakeLists.txt | 8 +-
79 files changed, 424 insertions(+), 88 deletions(-)
create mode 100644 Help/release/dev/vs-generator-platform.rst
create mode 100644 Help/variable/CMAKE_GENERATOR_PLATFORM.rst
create mode 100644 Help/variable/CMAKE_VS_PLATFORM_NAME.rst
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorPlatform/BadPlatform-result.txt} (100%)
copy Tests/RunCMake/{GeneratorToolset/BadToolset-stderr.txt => GeneratorPlatform/BadPlatform-stderr.txt} (55%)
copy Tests/RunCMake/{GeneratorToolset/BadToolset.cmake => GeneratorPlatform/BadPlatform.cmake} (100%)
copy Tests/RunCMake/{CMP0004 => GeneratorPlatform}/CMakeLists.txt (100%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorPlatform/NoPlatform-result.txt} (100%)
create mode 100644 Tests/RunCMake/GeneratorPlatform/NoPlatform-stderr.txt
create mode 100644 Tests/RunCMake/GeneratorPlatform/NoPlatform.cmake
create mode 100644 Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake
create mode 100644 Tests/RunCMake/GeneratorPlatform/x64Platform-stdout.txt
create mode 100644 Tests/RunCMake/GeneratorPlatform/x64Platform.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list