summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.10'Brad King2018-01-100-0/+0
|\
| * Merge branch 'backport-kwiml-riscv' into release-3.10Brad King2018-01-091-1/+1
| |\ | | | | | | | | | | | | There is no corresponding merge request because this fix was cherry-picked specifically for CMake 3.10.
| | * KWIML: Backport RISC-V update to CMake 3.10Brad King2018-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport KWIML commit 6fc81d8816 (abi.h: Update RISC-V support for revised macro names, 2017-12-30) to the CMake 3.10 release branch. The upstream RISC-V project changed some compiler symbols so `__riscv__` must now be renamed `__riscv`. Patch-by: Richard W.M. Jones <rjones@redhat.com>
* | | Merge topic 'unhardcode-configuration-types'Brad King2018-01-1032-411/+115
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f4d7a07 Help: Add references and backticks in LINK_FLAGS prop_tgt 48f7e2d3 Unhardcode the CMAKE_CONFIGURATION_TYPES values Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1345
| * | | Help: Add references and backticks in LINK_FLAGS prop_tgtBeren Minor2018-01-081-2/+3
| | | |
| * | | Unhardcode the CMAKE_CONFIGURATION_TYPES valuesBeren Minor2018-01-0832-410/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes duplicated code for per-config variable initialization by providing a `cmake_initialize_per_config_variable(<PREFIX> <DOCSTRING>)` function. This function initializes a `<PREFIX>` cache variable from `<PREFIX>_INIT` and unless the `CMAKE_NOT_USING_CONFIG_FLAGS` variable is defined, does the same with `<PREFIX>_<CONFIG>` from `<PREFIX>_<CONFIG>_INIT` for every `<CONFIG>` in `CMAKE_CONFIGURATION_TYPES` for multi-config generators or `CMAKE_BUILD_TYPE` for single-config generators.
* | | | Merge topic 'serverTestInfoExpandVariables'Brad King2018-01-101-7/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c1ecab6 server: Expand generator expressions for test info Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1633
| * | | | server: Expand generator expressions for test infoJustin Goshi2018-01-041-7/+18
| | | | |
* | | | | Merge topic 'update-kwiml'Brad King2018-01-105-9/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a53242d Merge branch 'upstream-KWIML' into update-kwiml 6e921648 KWIML 2018-01-09 (9c2d6cae) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1636
| * \ \ \ \ Merge branch 'upstream-KWIML' into update-kwimlBrad King2018-01-095-9/+38
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWIML: KWIML 2018-01-09 (9c2d6cae)
| | * | | | | KWIML 2018-01-09 (9c2d6cae)KWIML Upstream2018-01-095-9/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwiml.git at commit 9c2d6caecd8cd937b891009c681f90748df85dfd (master). Upstream Shortlog ----------------- Brad King (5): fc9d607a Use static_cast when compiling as C++ ea9336bc Update copyright year 7db8b884 Suppress MSVC static_cast warnings in verification and test code 340af24d Update copyright year 9c2d6cae Fix compilation on Borland C++ 5.8 Richard W.M. Jones (1): 6fc81d88 abi.h: Update RISC-V support for revised macro names
* | | | | | | CMake Nightly Date StampKitware Robot2018-01-101-1/+1
| | | | | | |
* | | | | | | Merge topic 'add_cuda_to_source_regex'Craig Scott2018-01-098-8/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81868e6b CUDA: Add cu as default source file extension Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !1629
| * | | | | | | CUDA: Add cu as default source file extensionRobert Maynard2018-01-088-8/+14
| | | | | | | |
* | | | | | | | Merge branch 'release-3.10'Brad King2018-01-090-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge branch 'FindPostgres_support_for_v10' into release-3.10Brad King2018-01-091-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1635
* | \ \ \ \ \ \ \ Merge topic 'FindPostgres_support_for_v10'Brad King2018-01-091-2/+2
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9417a6d3 FindPostgreSQL: Add support for PG10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1635
| * | | | | | | | FindPostgreSQL: Add support for PG10Egor Pugin2018-01-091-2/+2
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge topic 'cpack_versions'Brad King2018-01-091-5/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e4153640 Cpack.cmake: Document some CPACK_* default values Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1608
| * | | | | | | | Cpack.cmake: Document some CPACK_* default valuesHarry Mallon2017-12-201-5/+6
| | | | | | | | |
* | | | | | | | | Merge topic 'COMPILE_FLAGS-clarify-sf-prop-documentation'Brad King2018-01-091-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 118815f0 COMPILE_FLAGS: do not imply that the property is a list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1640
| * | | | | | | | | COMPILE_FLAGS: do not imply that the property is a listBen Boeckel2018-01-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "added to the list" language hinted that the property was interpreted as a CMake list, but this is not correct. It is just a string.
* | | | | | | | | | Merge topic 'doc-CMAKE_SYSTEM_NAME-mode'Brad King2018-01-091-0/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edebf6f3 Help: note that CMAKE_SYSTEM_NAME is not set in script mode Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1639
| * | | | | | | | | | Help: note that CMAKE_SYSTEM_NAME is not set in script modeKyle Edwards2018-01-081-0/+3
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #17109.
* | | | | | | | | | Merge topic 'doc-OUTPUT_NAME-clarify'Brad King2018-01-091-1/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c5d3989 Help: fix documentation for OUTPUT_NAME Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1638
| * | | | | | | | | | Help: fix documentation for OUTPUT_NAMEKyle Edwards2018-01-081-1/+2
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #17177.
* | | | | | | | | | Merge topic 'vs10-target-generator-range-for'Brad King2018-01-091-238/+167
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d09af946 VS: Modernize 'for' loops in cmVisualStudio10TargetGenerator to C++11 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !1617
| * | | | | | | | | | VS: Modernize 'for' loops in cmVisualStudio10TargetGenerator to C++11Vitaly Stakhovsky2017-12-211-238/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'auto' used for complex types
* | | | | | | | | | | Merge topic 'vs-ranged-for'Brad King2018-01-0911-247/+167
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 92c7b526 VS: Use range-based 'for' loops in generator code Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !1616
| * | | | | | | | | | | VS: Use range-based 'for' loops in generator codeVitaly Stakhovsky2017-12-2111-247/+167
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `auto` for complex types.
* | | | | | | | | | | Merge topic 'FindCUDA-deduplicate-c+std-host-flags'Brad King2018-01-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff41a4b8 FindCUDA: de-duplicates C++11 flag when propagating host flags. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1628
| * | | | | | | | | | | FindCUDA: de-duplicates C++11 flag when propagating host flags.David Hirvonen2018-01-061-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'msvc2017-findcuda'Brad King2018-01-092-9/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fab1b432 FindCUDA: Update to properly find MSVC 2017 compiler tools Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !1631
| * | | | | | | | | | | | FindCUDA: Update to properly find MSVC 2017 compiler toolsAaron Bray2018-01-082-9/+16
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An implementation that handles the different installation locations of visual studio compiler tools
* | | | | | | | | | | | Merge topic 'improve_generated_property_docs'Craig Scott2018-01-091-4/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 11615b29 GENERATED: Improve the documentation of the GENERATED file property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1630
| * | | | | | | | | | | | GENERATED: Improve the documentation of the GENERATED file propertyRobert Maynard2018-01-081-4/+19
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-01-091-1/+1
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Merge topic 'use_generator_is_multi_config'Brad King2018-01-0847-102/+176
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3c413e2a GENERATOR_IS_MULTI_CONFIG: Use for multi-config checks in Modules c267ea1c GENERATOR_IS_MULTI_CONFIG: Use for multi-config checks in Tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1627
| * | | | | | | | | | | GENERATOR_IS_MULTI_CONFIG: Use for multi-config checks in ModulesCraig Scott2017-12-298-26/+42
| | | | | | | | | | | |
| * | | | | | | | | | | GENERATOR_IS_MULTI_CONFIG: Use for multi-config checks in TestsCraig Scott2017-12-2939-76/+134
| | | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'execute_process_UTF8_keyword'Brad King2018-01-085-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8caec41e execute_process: Allow UTF-8 as a synonym for the UTF8 keyword Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !1623
| * | | | | | | | | | | execute_process: Allow UTF-8 as a synonym for the UTF8 keywordCraig Scott2017-12-275-4/+8
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UTF-8 is the proper naming according to the UTF-8 RFC and is also the name used for a similar keyword in the file() command. This commit brings (backward compatible) consistency to the keyword names and allows the standard UTF-8 name to be used with execute_process(). The old UTF8 keyword is still supported.
* | | | | | | | | | | Merge topic '17431-iphone-deployment-target'Brad King2018-01-0819-27/+200
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4017bf40 Darwin: Emit deployment target that matches the SDK 8f4663ff Xcode: rename embedded SDK query function Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1447
| * | | | | | | | | | Darwin: Emit deployment target that matches the SDKGregor Jasny2017-12-2215-15/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes: #17431
| * | | | | | | | | | Xcode: rename embedded SDK query functionGregor Jasny2017-12-227-13/+16
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-01-081-1/+1
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-01-071-1/+1
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-01-061-1/+1
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-01-051-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'various-typos'Craig Scott2018-01-0461-69/+69
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3ab7bf82 Various typo fixes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1626