summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmMakefile: return a backtraceBen Boeckel2014-06-0510-69/+38
| | | | | This allows backtraces to be fully controlled by the makefile rather than externally (and makes changing how they are manipulated easier).
* Merge topic 'delay-generator-toolset'Brad King2014-06-0521-37/+127
|\ | | | | | | | | | | | | 528e8af1 Allow a toolchain file to specify a generator toolset 98afb454 VS: Split user- and generator-provided PlatformToolset 3e9f6e36 Xcode: Rename internal variable {Platform => Generator}Toolset
| * Allow a toolchain file to specify a generator toolsetBrad King2014-06-0419-20/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay use of CMAKE_GENERATOR_TOOLSET until the CMakeSystem.cmake file has been configured and loaded during the first project() or enable_language() command. This gives the toolchain file named by CMAKE_TOOLCHAIN_FILE a chance to set CMAKE_GENERATOR_TOOLSET. This point is still early enough to set the generator toolset prior to the initialization of any languages that might use the toolset. The cmake::GeneratorToolset member variable remains an indication of what was specified by the -T option or loaded from the cache. It does not need to be updated based on the toolchain file setting. The cmMakefile::TryCompile can still pass cmake::GeneratorToolset into the inner instance because the try-compiled project will do platform and language initialization using the CMakeSystem module configured for the outer project. Extend the RunCMake.GeneratorToolset test with cases that use a toolchain file to set CMAKE_GENERATOR_TOOLSET.
| * VS: Split user- and generator-provided PlatformToolsetBrad King2014-06-044-13/+25
| | | | | | | | | | | | | | Divide the cmGlobalVisualStudio10Generator "PlatformToolset" member into two members representing the generator-selected default toolset and the user-specified CMAKE_GENERATOR_TOOLSET value. Prefer the user-specified value, if any, and then fall back to the generator-selected default.
| * Xcode: Rename internal variable {Platform => Generator}ToolsetBrad King2014-06-042-6/+6
| | | | | | | | The latter matches with CMAKE_GENERATOR_TOOLSET better.
* | Merge branch 'release'Brad King2014-06-050-0/+0
|\ \
| * \ Merge branch 'fix-ctest-option-summary' into releaseBrad King2014-06-051-1/+2
| |\ \
* | \ \ Merge topic 'minor-help-cleanup'Brad King2014-06-053-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7eef823e Help: Add comma to assist parsing of ctest_build command docs. 5fb9b16d Help: Document that file(GENERATE) re-writes only when needed. 95135ac3 Help: Add missing external link marker.
| * | | | Help: Add comma to assist parsing of ctest_build command docs.Stephen Kelly2014-06-051-1/+1
| | | | |
| * | | | Help: Document that file(GENERATE) re-writes only when needed.Stephen Kelly2014-06-051-0/+2
| | | | |
| * | | | Help: Add missing external link marker.Stephen Kelly2014-06-051-1/+1
| | |_|/ | |/| |
* | | | Merge topic 'fix-ctest-option-summary'Brad King2014-06-051-1/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | 6446eb09 CTest: Added option description for --output-on-failure
| * | | CTest: Added option description for --output-on-failureNils Gladitz2014-06-051-1/+2
| | | | | | | | | | | | | | | | Without it the option list is cut short after --debug.
* | | | Merge topic 'expand_cobertura_coverage'Brad King2014-06-0510-26/+323
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 50daf239 CTest: Generalize Cobertura coverage format handling a2822d30 CTest: Rename coverage implementation for "Python" to "Cobertura"
| * | | | CTest: Generalize Cobertura coverage format handlingJoseph Snyder2014-06-047-9/+306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Cobertura coverage files written by Java. Add a test which uses the report from a Java run of Cobertura to calculate coverage. In the documentation of CTEST_COVERAGE_COMMAND, give a sample .sh file to merge the Cobertura .ser files and generate the XML report from the merged file.
| * | | | CTest: Rename coverage implementation for "Python" to "Cobertura"Joseph Snyder2014-06-045-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The coverage.py tool writes out an XML that conforms to the Cobertura Coverage tool standard. Rename the cmParsePythonCoverage files to instead be cmParseCoberturaCoverage.
* | | | | Merge topic 'setlocale'Brad King2014-06-054-0/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 730e3862 Encoding: Add setlocale() to applications.
| * | | | | Encoding: Add setlocale() to applications.Clinton Stimpson2014-06-044-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | See also bug #14934 where chinese characters could not be used with cpack.
* | | | | | CMake Nightly Date StampKitware Robot2014-06-051-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge branch 'release'Brad King2014-06-040-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'fix-build-crash-on-bad-generator' into releaseBrad King2014-06-0310-1/+21
| |\ \ \ \
* | \ \ \ \ Merge topic 'fix-build-crash-on-bad-generator'Brad King2014-06-0410-1/+21
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | 44e2923f cmake: Fix --build crash on bad CMAKE_GENERATOR in cache
| * | | | | cmake: Fix --build crash on bad CMAKE_GENERATOR in cacheBrad King2014-06-0310-1/+21
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we fail to create the generator named by CMAKE_GENERATOR, exit with an error message instead of crashing. While at it, fix the wording of the error message when CMAKE_GENERATOR is not set. Extend the RunCMake.CommandLine test with cases covering the "cmake --build" option when the named directory does not provide a CMakeCache.txt with a valid CMAKE_GENERATOR.
* | | | | CMake Nightly Date StampKitware Robot2014-06-041-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'doc-ctest-variables'Brad King2014-06-0347-45/+317
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 34c6fd3a Help: Convert CTest Script variable references to cross-references de710f37 Help: Add placeholder documents for CTest Script variables
| * | | | Help: Convert CTest Script variable references to cross-referencesBrad King2014-06-032-45/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the ctest(1) manual and ctest_start() command documentation, convert mentions of CTest Script variables to cross-references so they will be rendered as links.
| * | | | Help: Add placeholder documents for CTest Script variablesBrad King2014-06-0345-0/+270
|/ / / / | | | | | | | | | | | | | | | | | | | | Provide a minimal explanation of each variable by simply naming the corresponding ctest(1) setting and linking to the ctest(1) manual.
* | | | Merge branch 'release'Brad King2014-06-030-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'cmake-credits' into releaseBrad King2014-06-031-1/+1
| |\ \ \
* | \ \ \ Merge topic 'cmake-credits'Brad King2014-06-031-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | 889f2fd8 Simplify and clarify credit text and link
| * | | | Simplify and clarify credit text and linkBrad King2014-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Use the name "Kitware" rather than "Kitware, Inc." to simplify the text. Provide a CMake-specific URL.
* | | | | Merge branch 'release'Brad King2014-06-030-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'cmake-credits' into releaseBrad King2014-06-033-5/+5
| |\ \ \ \ | | |/ / /
* | | | | Merge topic 'cmake-credits'Brad King2014-06-033-5/+5
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | 8da0a75b Simplify and clarify credit text and link
| * | | | Simplify and clarify credit text and linkBrad King2014-06-033-5/+5
| | |/ / | |/| | | | | | | | | | | | | | Use the name "Kitware" rather than "Kitware, Inc." to simplify the text. Provide a CMake-specific URL.
* | | | Merge branch 'release'Brad King2014-06-030-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'doc-include-dir-props' into releaseBrad King2014-06-023-3/+45
| |\ \ \
* | \ \ \ Merge topic 'doc-include-dir-props'Brad King2014-06-033-3/+35
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | 907e422b Help: Explain build/install-tree include dirs in more places (#14946)
| * | | | Help: Explain build/install-tree include dirs in more places (#14946)Brad King2014-06-023-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain how to use $<BUILD_INTERFACE> and $<INSTALL_INTERFACE> directly in the documentation of the target_include_directories command and INTERFACE_INCLUDE_DIRECTORIES target property. Otherwise readers need to notice the link to the cmake-buildsystem(7) manual and find the example in that to understand the need for these expressions. Also fix the explanation in cmake-buildsystem(7) to not claim that relative paths may be used inside a BUILD_INTERFACE expression.
* | | | | CMake Nightly Date StampKitware Robot2014-06-031-1/+1
| | | | |
* | | | | Merge topic 'FindQt4-doc-section-underlines'Brad King2014-06-021-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 06ab7db3 FindQt4: Use standard section header underline convention
| * | | | | FindQt4: Use standard section header underline conventionBrad King2014-06-021-6/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The FindQt4 module is a CMake Domain object of type "module". Our convention for domain object document titles is "------" and domain object document sections is "^^^^^^". Switch to these within the FindQt4 documentation.
* | | | | Merge topic 'doc-section-header-convention'Brad King2014-06-024-120/+147
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 793b64e4 Help: Document section header underline hierarchy in cmake-developer.7 05bd31ab Help: Organize documentation style sections in cmake-developer.7 eaafe756 Help: Add documentation style section headers to cmake-developer.7 4207b3a3 Help: Use "^^^^" for subsubsection headers
| * | | | | Help: Document section header underline hierarchy in cmake-developer.7Brad King2014-06-021-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly specify the sequence of underline characters we use in the CMake documentation. It is the same sequence as that suggested in the Sphinx documentation, but we have our own descriptions.
| * | | | | Help: Organize documentation style sections in cmake-developer.7Brad King2014-06-021-77/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the style guidelines have section titles instead of numbers, organize them into more well-defined sections.
| * | | | | Help: Add documentation style section headers to cmake-developer.7Brad King2014-06-021-110/+132
| | | | | | | | | | | | | | | | | | | | | | | | Give the style guides titles instead of numbers so we can link to them.
| * | | | | Help: Use "^^^^" for subsubsection headersBrad King2014-06-024-10/+10
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | This is the convention suggested in the Sphinx documentation and is already used in several other places in the CMake documentation. Update a few places where we were using other characters.
* | | | | Merge topic 'feature-extensions-by-default'Brad King2014-06-0216-31/+52
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 60a981ea Features: Enable compiler extensions by default.
| * | | | | Features: Enable compiler extensions by default.Stephen Kelly2014-05-3116-31/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compilers enable their extensions by default, and disabling them implicitly can lead to results which are surprising or non-obvious to debug. http://public.kitware.com/pipermail/cmake-developers/2014-May/010575.html http://thread.gmane.org/gmane.comp.programming.tools.cmake.devel/10214 https://www.mail-archive.com/cmake-developers@cmake.org/msg10116.html (Compiler feature extensions by default, 29 May 2014)
* | | | | | Merge topic 'doc-ctest-settings'Brad King2014-06-023-0/+609
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2d57a390 Help: Document ctest dashboard client usage 28f73dff Help: Document ctest_start initial checkout command variables