[Cmake-commits] CMake branch, master, updated. v2.8.12.1-701-g1da77bf
Brad King
brad.king at kitware.com
Tue Nov 19 10:55:43 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 1da77bf1ee4f3ba315ebb00da2eaeac474614cad (commit)
via 4cce44b6c50a40ee13f423ae311d5db5a66a13f4 (commit)
via 558c74d0abfe4f4fc8563ba615b7329083d232bc (commit)
via 5229f2df63369af1734783ee190cbfc7c41fac8f (commit)
via 72dd738bd4856dcd2a483e732a26f49e9c6dfcc4 (commit)
via fd6076d075d705c4731f71a544436ba82a1577bf (commit)
via 68031abf15affedc72c13b8b7f1ff025f510bd20 (commit)
via 003d10c248f3f55cea7885ac83300777d687c8a5 (commit)
via e47d934a5a2da9f7589c801c2c232a650e2c797e (commit)
via e965cb12e2083d6b869fb30fabe7e290e6094908 (commit)
via 72bf2552f2c750bc52b9e2cc3f85320d6452c3a4 (commit)
via 4d1d7725f3e12399dd3785f5ffb7eae7db1be984 (commit)
via 96966b5c804a95677e43e3938c52afbd42b5d48a (commit)
via 91a021146c7a8eb256eca7bb3d9be3acfe3ce814 (commit)
via 123a0608dfe6cf155f0fc095cf389ae7b3d4ebb0 (commit)
via 5f5c92b9a2c2f9c780c08e23231b93af71f175bd (commit)
via 4ac75fdfe6e7a91f3beea037d13b1f4c8c8b80ed (commit)
via cc23f92861aeb2443cc5b6443c04a761c99bb100 (commit)
via 20bac8f19e1fa12856e96b8e9541e518068d2122 (commit)
via 4d85365307975cfdb07e824b46b76da5aed4ed1e (commit)
via 95b28eb76329262d10e60f4ad67172f8a566855c (commit)
via c85672634c37d640ea99fd5b36d7889a53c922b2 (commit)
via f2b1d653cf4124e32c324f54848d55f52ca8370d (commit)
via 8ee6b4763034439ce5aada285de5fa584144c6c6 (commit)
via 7fc7624af5403e6bff9dbc99da398be314c0b223 (commit)
via 0a7f17b870ceb03fd8687d630ed6fb875dcdc66a (commit)
via 1f679b8d46069696e14b3ff512fee2696c4e601e (commit)
via 8904d1410be3d62fc48d3bdaa87cbce3895fc815 (commit)
via 0814d0a6559ed3634dafb372f34491407a27c5e8 (commit)
via ee6e4ac841d8094b59cd0a48c61d7ca3b68c68c2 (commit)
via 2d072069e2ef44780c214c847285df8ed8e70bba (commit)
via bca67c710f21cdea70c9b23fe927c87135ee81d9 (commit)
via 05923172f94d804dfba33957aa08ac88cc5cd0bd (commit)
via 1befbfad3d9971335ab0e7deb1a93acfdccf0fb6 (commit)
from 856468213640417d401c6ff70c1f43c1c31145dc (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=1da77bf1ee4f3ba315ebb00da2eaeac474614cad
commit 1da77bf1ee4f3ba315ebb00da2eaeac474614cad
Merge: 8564682 4cce44b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 19 10:55:39 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 19 10:55:39 2013 -0500
Merge topic 'cleanup-build-commands'
4cce44b Help: Document the CMAKE_MAKE_PROGRAM variable in more detail
558c74d VS: Switch to internal CMAKE_MAKE_PROGRAM lookup by generators
5229f2d Tests: Do not use an explicit make program for VS generators
72dd738 Tests: Fix MFC test heuristic for empty CMAKE_TEST_MAKEPROGRAM
fd6076d Tests: Pass CMAKE_MAKE_PROGRAM instead of --build-makeprogram
68031ab Tests: Configure SubProject-Stage2 test more robustly
003d10c Tests: Simplify VSExcludeFromDefaultBuild configuration
e47d934 Tests: Simplify VSProjectInSubdir configuration
e965cb1 Tests: Simplify CTest.BuildCommand.ProjectInSubdir configuration
72bf255 Tests: Pass --build-options to every test
4d1d772 ctest: Teach --build-options to allow zero options
96966b5 ctest: Make the --build-makeprogram optional for --build-and-test
91a0211 Simplify some calls to cmGlobalGenerator::Build
123a060 Teach GenerateBuildCommand to find its own make program
5f5c92b VS: Add internal APIs to find MSBuild, devenv/VCExpress, and msdev
4ac75fd Prefer CMAKE_MAKE_PROGRAM over CMAKE_BUILD_TOOL (#14548)
...
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 5 -
Help/command/build_command.rst | 45 ++--
Help/manual/ctest.1.rst | 6 +-
Help/variable/CMAKE_BUILD_TOOL.rst | 11 +-
Help/variable/CMAKE_MAKE_PROGRAM.rst | 50 ++++-
Modules/CMakeCXXInformation.cmake | 1 -
Modules/CMakeCommonLanguageInclude.cmake | 6 +-
Modules/CMakeVS10FindMake.cmake | 54 ----
Modules/CMakeVS11FindMake.cmake | 53 ----
Modules/CMakeVS12FindMake.cmake | 27 --
Modules/CMakeVS6FindMake.cmake | 25 --
Modules/CMakeVS71FindMake.cmake | 26 --
Modules/CMakeVS7FindMake.cmake | 25 --
Modules/CMakeVS8FindMake.cmake | 34 ---
Modules/CMakeVS9FindMake.cmake | 39 ---
Modules/CTest.cmake | 2 +-
Source/CPack/cmCPackGenerator.cxx | 18 +-
Source/CTest/cmCTestBuildAndTestHandler.cxx | 32 +--
Source/CTest/cmCTestBuildCommand.cxx | 9 +-
Source/cmBuildCommand.cxx | 33 +--
Source/cmGlobalGenerator.cxx | 145 ++++++-----
Source/cmGlobalGenerator.h | 21 +-
Source/cmGlobalKdevelopGenerator.cxx | 2 +-
Source/cmGlobalNinjaGenerator.cxx | 49 ++---
Source/cmGlobalNinjaGenerator.h | 18 +-
Source/cmGlobalUnixMakefileGenerator3.cxx | 48 ++--
Source/cmGlobalUnixMakefileGenerator3.h | 17 +-
Source/cmGlobalVisualStudio10Generator.cxx | 179 ++++++++-----
Source/cmGlobalVisualStudio10Generator.h | 23 ++-
Source/cmGlobalVisualStudio11Generator.cxx | 1 -
Source/cmGlobalVisualStudio12Generator.cxx | 1 -
Source/cmGlobalVisualStudio6Generator.cxx | 106 ++++----
Source/cmGlobalVisualStudio6Generator.h | 23 +-
Source/cmGlobalVisualStudio71Generator.cxx | 1 -
Source/cmGlobalVisualStudio7Generator.cxx | 101 +++++---
Source/cmGlobalVisualStudio7Generator.h | 24 ++-
Source/cmGlobalVisualStudio8Generator.cxx | 21 ++-
Source/cmGlobalVisualStudio8Generator.h | 2 +
Source/cmGlobalVisualStudio9Generator.cxx | 1 -
Source/cmGlobalVisualStudioGenerator.cxx | 13 +
Source/cmGlobalVisualStudioGenerator.h | 3 +
Source/cmGlobalXCodeGenerator.cxx | 70 ++---
Source/cmGlobalXCodeGenerator.h | 18 +-
Source/cmSystemTools.cxx | 35 +++-
Source/cmSystemTools.h | 7 +
Source/cmake.cxx | 11 +-
Source/cmaketest.h.in | 16 --
Tests/BootstrapTest.cmake | 10 +
Tests/CMakeInstall.cmake | 22 +--
Tests/CMakeLists.txt | 286 ++++++++++++--------
.../CTestBuildCommandProjectInSubdir.cmake.in | 2 +-
Tests/ExportImport/CMakeLists.txt | 2 -
Tests/ExportImport/InitialCache.cmake.in | 1 +
Tests/Fortran/CMakeLists.txt | 2 +-
Tests/MacRuntimePath/CMakeLists.txt | 2 -
Tests/MacRuntimePath/InitialCache.cmake.in | 1 +
Tests/MakeClean/CMakeLists.txt | 11 +-
Tests/RunCMake/CTest/BeforeProject-stderr.txt | 10 +-
.../build_command/BeforeProject-result.txt | 1 -
.../build_command/BeforeProject-stderr.txt | 10 +-
Tests/RunCMake/build_command/BeforeProject.cmake | 1 +
Tests/RunCMake/build_command/ErrorsCommon.cmake | 4 +-
Tests/SimpleInstall/CMakeLists.txt | 25 +-
Tests/SimpleInstallS2/CMakeLists.txt | 25 +-
Tests/TestInstall.sh.in | 63 -----
65 files changed, 893 insertions(+), 1042 deletions(-)
delete mode 100644 Modules/CMakeVS10FindMake.cmake
delete mode 100644 Modules/CMakeVS11FindMake.cmake
delete mode 100644 Modules/CMakeVS12FindMake.cmake
delete mode 100644 Modules/CMakeVS6FindMake.cmake
delete mode 100644 Modules/CMakeVS71FindMake.cmake
delete mode 100644 Modules/CMakeVS7FindMake.cmake
delete mode 100644 Modules/CMakeVS8FindMake.cmake
delete mode 100644 Modules/CMakeVS9FindMake.cmake
delete mode 100644 Source/cmaketest.h.in
create mode 100644 Tests/BootstrapTest.cmake
delete mode 100644 Tests/RunCMake/build_command/BeforeProject-result.txt
delete mode 100755 Tests/TestInstall.sh.in
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list