summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* VS: Simplify XML codeVitaly Stakhovsky2018-03-275-50/+35
| | | | Get rid of suffix arguments
* Merge topic 'cmake_minimum_required-forward-compat'Craig Scott2018-03-277-11/+45
|\ | | | | | | | | | | | | 8dc97acb03 cmake_minimum_required: Tolerate unknown future arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1888
| * cmake_minimum_required: Tolerate unknown future argumentsBrad King2018-03-267-11/+45
| | | | | | | | | | | | | | | | | | When a `...<max>` version is given that is larger than the running version of CMake, assume that the project is aware of a newer version of CMake and that any unknown arguments are future arguments. This will allow future versions of CMake to add arguments to the command that projects can use without introducing errors in older versions of CMake (back to 3.12).
* | Merge branch 'release-3.11'Brad King2018-03-270-0/+0
|\ \
| * \ Merge branch 'revert-CTestTestfile-removal-again' into release-3.11Brad King2018-03-265-7/+18
| |\ \ | | | | | | | | | | | | Merge-request: !1887
* | \ \ Merge topic 'const-members'Brad King2018-03-272-34/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85468e0754 cmComputeLinkInformation: make some members const Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1886
| * | | | cmComputeLinkInformation: make some members constVitaly Stakhovsky2018-03-222-34/+34
| | | | |
* | | | | Merge topic 'vs-options-movexml'Brad King2018-03-276-83/+82
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a0d9429bd7 cmVisualStudioGeneratorOptions: Move XML code to subclasses Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1885
| * | | | | cmVisualStudioGeneratorOptions: Move XML code to subclassesVitaly Stakhovsky2018-03-266-83/+82
| | | | | |
* | | | | | Merge topic 'revert-CTestTestfile-removal-again'Brad King2018-03-275-7/+18
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 70c50aa23c Revert "Remove CTestTestfile.cmake when BUILD_TESTING is OFF" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1887
| * | | | | Revert "Remove CTestTestfile.cmake when BUILD_TESTING is OFF"Brad King2018-03-265-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.8.0-rc1~305^2 (Remove CTestTestfile.cmake when BUILD_TESTING is OFF, 2016-11-14) again. We reverted it once in commit v3.8.0-rc3~22^2 (Revert "Remove CTestTestfile.cmake when BUILD_TESTING is OFF", 2017-03-06) but it was accidentally restored by commit v3.11.0-rc1~387^2 (server: add "ctestInfo" request to get test info, 2017-10-25), perhaps due to conflict resolution during rebase. We cannot remove `CTestTestfile.cmake` when testing is off because it breaks projects that never enable testing but create their own `CTestTestfile.cmake` manually instead. Revert the change again and add a test case.
* | | | | | CMake Nightly Date StampKitware Robot2018-03-271-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'UseSWIG-fix-library-prefix'Brad King2018-03-262-9/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51b642679b UseSWIG: fix prefix library for Java on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Mathieu Malaterre <mathieu.malaterre@gmail.com> Merge-request: !1871
| * | | | | UseSWIG: fix prefix library for Java on WindowsMarc Chevrier2018-03-222-9/+23
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17836
* | | | | | Merge topic 'bootstrap-var-options'Brad King2018-03-261-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 850cfe3a3b bootstrap: Add support for VAR=value options to specify tools and flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1859
| * | | | | | bootstrap: Add support for VAR=value options to specify tools and flagsJames Lee2018-03-221-0/+8
| | | | | | |
* | | | | | | Merge topic 'pr.checksymbol'Brad King2018-03-261-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20c204244b CheckSymbolExists: Fix CMP0054 warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1884
| * | | | | | | CheckSymbolExists: Fix CMP0054 warningRuslan Baratov2018-03-221-0/+5
| | | | | | | |
* | | | | | | | Merge topic 'contract-plplot'Brad King2018-03-261-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53e3080be3 Tests: Restore PLplot contract test repository https URL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1883
| * | | | | | | | Tests: Restore PLplot contract test repository https URLBrad King2018-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch back to the `https://` repository URL but without the `.git` extensions. It seems faster than the `git://` protocol for this server.
* | | | | | | | | Merge branch 'release-3.11'Brad King2018-03-260-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'boost-1.67' into release-3.11Brad King2018-03-211-41/+129
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1865
* | | | | | | | | | CMake Nightly Date StampKitware Robot2018-03-261-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2018-03-251-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2018-03-241-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge topic 'pr.find_package.prefixes'Craig Scott2018-03-232-15/+27
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4eb5d851d5 Help: Add 'lib32|libx32|lib64' paths to find_package prefixes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1878
| * | | | | | | | | | Help: Add 'lib32|libx32|lib64' paths to find_package prefixesRuslan Baratov2018-03-212-15/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the conditions when 'lib32|libx32|lib64' variants will be added to the list of possible installation prefixes.
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-03-231-1/+1
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge topic 'list-sublist'Craig Scott2018-03-2221-0/+156
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 768225837d list: Add SUBLIST sub-command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1874
| * | | | | | | | | | list: Add SUBLIST sub-commandMarc Chevrier2018-03-2121-0/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #17823
* | | | | | | | | | | Merge topic 'policy-version-range'Craig Scott2018-03-2218-68/+244
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 45408b5ea1 cmake_minimum_required: Optionally set policies with version range 6a41aa2abd cmPolicies: Split parsing and impl of ApplyPolicyVersion 1d00ed7cf7 cmPolicies: Drop unnecessary check from ApplyPolicyVersion 0df559832b cmPolicies: Pass policy version as std::string Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1864
| * | | | | | | | | | cmake_minimum_required: Optionally set policies with version rangeBrad King2018-03-2118-41/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach `cmake_minimum_required` and `cmake_policy(VERSION)` to support a version range of the form `<min>[...<max>]`. Define this to mean that version `<min>` is required, but known policies up to those introduced by `<max>` will be set to `NEW`. This will allow projects to easily specify a range of versions for which they have been updated.
| * | | | | | | | | | cmPolicies: Split parsing and impl of ApplyPolicyVersionBrad King2018-03-162-19/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also rename local variables to clarify their role during parsing.
| * | | | | | | | | | cmPolicies: Drop unnecessary check from ApplyPolicyVersionBrad King2018-03-161-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This internal API is never called with `version_min` empty.
| * | | | | | | | | | cmPolicies: Pass policy version as std::stringBrad King2018-03-164-8/+10
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'boost-1.67'Brad King2018-03-221-41/+129
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1673923c30 FindBoost: Add support for Boost 1.67 with Python version suffixes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1865
| * | | | | | | | | | FindBoost: Add support for Boost 1.67 with Python version suffixesRoger Leigh2018-03-211-41/+129
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16612, #16335, #16391, #12955
* | | | | | | | | | Merge topic 'ccmake-revise-default'Brad King2018-03-224-12/+95
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99bf77f49c ccmake: Check for curses more robustly before enabling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1881
| * | | | | | | | | | ccmake: Check for curses more robustly before enablingBrad King2018-03-214-12/+95
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compute a default for `BUILD_CursesDialog` by building a small test project that uses curses. Disable `ccmake` by default if it fails, and do not search for Curses as part of the main build. This avoids creating FindCurses cache entries when we are not considering ccmake. If `BUILD_CursesDialog` is enabled (e.g. by the user) then warn if curses cannot be found.
* | | | | | | | | | Merge topic 'vs-flags-improvement'Brad King2018-03-222-72/+65
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5697c6ae03 cmVisualStudioGeneratorOptions: Factor out an OutputFlag helper Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1862
| * | | | | | | | | | cmVisualStudioGeneratorOptions: Factor out an OutputFlag helperVitaly Stakhovsky2018-03-202-72/+65
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'clarify_inherited_properties'Brad King2018-03-2211-24/+205
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff6234509e Help: Clarify behavior of INHERITED properties 9cc97ab4dc Tests: Add tests for INHERITED property chaining Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1879
| * | | | | | | | | | Help: Clarify behavior of INHERITED propertiesCraig Scott2018-03-217-24/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17839
| * | | | | | | | | | Tests: Add tests for INHERITED property chainingCraig Scott2018-03-214-0/+134
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge topic 'find-package_root-revise'Brad King2018-03-222-6/+16
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3f479a3ca3 find_package: Improve CMP0074 warning messages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1880
| * | | | | | | | | find_package: Improve CMP0074 warning messagesBrad King2018-03-212-6/+16
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Policy `CMP0074` was added by commit eb35d8884b (find_package: Use PackageName_ROOT variables as search prefixes, 2018-03-15). Revise the logic to avoid warning when a `PackageName_ROOT` variable is set to empty since that won't change the search behavior. Also, when we do warn include the variable value(s) for reference.
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-03-221-1/+1
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge topic 'FindPython-new-implementation'Brad King2018-03-2128-13/+1614
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 50b5e9ed13 CMake build: Use new FindPython module 352baee207 FindPython*: New implementation for Python stuff Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com> Acked-by: Alex Turbov <i.zaufi@gmail.com> Merge-request: !1819
| * | | | | | | | CMake build: Use new FindPython moduleMarc Chevrier2018-03-204-11/+10
| | | | | | | | |
| * | | | | | | | FindPython*: New implementation for Python stuffMarc Chevrier2018-03-2024-2/+1604
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16142