summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-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
| * | | | | Help: Document ctest dashboard client usageBrad King2014-05-302-0/+603
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the ctest(1) manual with a section describing configuration and usage of CTest as a CDash software quality dashboard client.
| * | | | | Help: Document ctest_start initial checkout command variablesBrad King2014-05-301-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Describe the behavior of the ctest_start() command when the CTEST_CHECKOUT_COMMAND or CTEST_CVS_CHECKOUT variable is set.
* | | | | | Merge topic 'policy-doc-updates'Brad King2014-06-022-36/+52
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b1f4e620 Help: Reference cmake_minimum_required from cmake_policy docs 69a23cb2 Help: Format cmake_policy command documentation 0c4835a3 Help: Add missing space in policy CMP0020 description
| * | | | | | Help: Reference cmake_minimum_required from cmake_policy docsBrad King2014-05-301-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note in a few places of the cmake_policy() command documentation that the cmake_minimum_required() command can set policies too. Inspired-by: Peter Kümmel <syntheticpp@gmx.net>
| * | | | | | Help: Format cmake_policy command documentationBrad King2014-05-301-35/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add reStructuredText markup manually to improve formatting of the documentation. Organize the documentation into subsections.
| * | | | | | Help: Add missing space in policy CMP0020 descriptionPeter Kümmel2014-05-301-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'backport-doc-include-dirs-example'Brad King2014-06-020-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | 6fbd9a8f Help: Add code example for INSTALL_INTERFACE to cmake-buildsystem.
| * | | | | Help: Add code example for INSTALL_INTERFACE to cmake-buildsystem.Stephen Kelly2014-06-021-1/+11
| | |_|_|/ | |/| | |
* | | | | CMake Nightly Date StampKitware Robot2014-06-021-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-06-011-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-05-311-1/+1
| | | | |
* | | | | Merge topic 'consistent-genex-target-message'Brad King2014-05-3020-14/+130
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | fb2fa476 Genex: Clarify error message on use with non-binary targets (#14899).
| * | | | Genex: Clarify error message on use with non-binary targets (#14899).Stephen Kelly2014-05-2920-14/+130
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-05-301-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'normalize-custom-command-paths'Brad King2014-05-293-1/+42
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | c4af46b4 add_custom_command: Normalize OUTPUT and DEPENDS paths.
| * | | | add_custom_command: Normalize OUTPUT and DEPENDS paths.Stephen Kelly2014-05-283-1/+42
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While tracing dependencies of a target, cmTargetTraceDependencies follows sources by full path to determine if the source is to be produced by a custom command. Commit 4959f341 (cmSourceFileLocation: Collapse full path for directory comparisons., 2014-03-27) changed the storage of target sources to be in the form of a normalized path instead of an unnormalized path. The path is followed by looking it up in a mapping via cmMakefile::GetSourceFileWithOutput to acquire an appropriate cmSourceFile. The mapping is populated with the OUTPUT components of add_custom_command invocations, however it is populated with unnormalized paths. This means that the tracing logic does not find appropriate cmSourceFiles, and does not generate appropriate build rules for the generated sources. Normalize the paths in the OUTPUT components of add_custom_command to resolve this. The paths in the DEPENDS component of add_custom_command are also not normalized, leading to the same problem again. Normalize the depends paths after generator evaluation and expansion.