Commit Graph

39161 Commits

Author SHA1 Message Date
Kitware Robot a0b5dade9a CMake Nightly Date Stamp 2018-04-02 00:01:04 -04:00
Kitware Robot 323d6b4c75 CMake Nightly Date Stamp 2018-04-01 00:01:07 -04:00
Kitware Robot 1d5ad1fdee CMake Nightly Date Stamp 2018-03-31 00:01:09 -04:00
Kitware Robot 2fc79bcb03 CMake Nightly Date Stamp 2018-03-30 00:01:09 -04:00
Brad King 894a41fc27 Merge topic 'vs-simplify'
80767dd50e VS: Simplify XML code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1895
2018-03-29 10:24:06 -04:00
Brad King 3272677e63 Merge topic 'genex-TARGET_NAME_IF_EXISTS'
7b173a2933 genex: Add TARGET_NAME_IF_EXISTS expression

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1890
2018-03-29 10:21:48 -04:00
Brad King a03105ac8c Merge topic 'remove-unused-variable'
fd6c452986 cmTarget: Remove unused variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1898
2018-03-29 10:17:18 -04:00
Brad King cdc6dd888e Merge topic 'gcov-warning-message'
ae1cbff07f CTest: The "Could not find gcov." message should not be a warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1894
2018-03-29 10:16:27 -04:00
Kitware Robot 08b49c277d CMake Nightly Date Stamp 2018-03-29 00:01:07 -04:00
Brad King fd6c452986 cmTarget: Remove unused variable
Remove an unused variable and its containing local scope accidentally
left by commit v3.11.0-rc1~44^2 (Reduce allocation of temporary values
on heap, 2018-01-25).
2018-03-28 11:09:56 -04:00
Brad King 98f23da8df Merge branch 'release-3.11' 2018-03-28 08:58:55 -04:00
Alex Turbov 7b173a2933 genex: Add TARGET_NAME_IF_EXISTS expression
Define `$<TARGET_NAME_IF_EXISTS:tgt>` to mean `tgt` if the target
exists and otherwise an empty string.
2018-03-28 08:38:00 -04:00
Betsy McPhail ae1cbff07f CTest: The "Could not find gcov." message should not be a warning
It now matches the log level of other coverage messages.
2018-03-28 08:32:46 -04:00
Brad King 61fd4c7420 CMake 3.11.0 v3.11.0 2018-03-28 07:26:56 -04:00
Brad King 5ee25f01ae Merge branch 'release-3.11' 2018-03-28 07:25:06 -04:00
Brad King 9dd7776cd9 Merge topic 'ctest_update-memory-problems'
27f033550a ctest_update: Fix crash when handling svn externals
75e8af3354 cmSystemTools: Fix ParseArguments out-of-bounds read

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1893
2018-03-28 07:23:47 -04:00
Kitware Robot cf39c14f46 CMake Nightly Date Stamp 2018-03-28 00:01:07 -04:00
Vitaly Stakhovsky 80767dd50e VS: Simplify XML code
Get rid of suffix arguments
2018-03-27 17:39:19 -04:00
Brad King 36881ee416 Merge branch 'ctest_update-memory-problems' into release-3.11
Merge-request: !1893
2018-03-27 08:51:01 -04:00
Brad King 27f033550a ctest_update: Fix crash when handling svn externals
Refactoring in commit v3.9.0-rc1~156^2 (c++: prefer vectors over lists,
2017-05-04) switched `cmCTestSVN::Repositories` from `std::list` to
`std::vector`.  This can cause re-allocation when svn externals are
processed and break the `RootInfo` pointer that is supposed to point at
the first repository element.  Switch back to `std::list` so that the
address remains stable.

Fixes: #17854
2018-03-27 08:46:20 -04:00
Brad King 75e8af3354 cmSystemTools: Fix ParseArguments out-of-bounds read
When checking for a Windows-style leading path, do not read past the
null terminator.

Issue: #17854
2018-03-27 08:46:20 -04:00
Craig Scott d5f0b2df8e Merge topic 'cmake_minimum_required-forward-compat'
8dc97acb03 cmake_minimum_required: Tolerate unknown future arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1888
2018-03-27 08:16:46 -04:00
Brad King 760f83d5c0 Merge branch 'release-3.11' 2018-03-27 08:11:01 -04:00
Brad King 99f3f6d528 Merge topic 'const-members'
85468e0754 cmComputeLinkInformation: make some members const

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1886
2018-03-27 07:51:34 -04:00
Brad King df0cfdf60e Merge topic 'vs-options-movexml'
a0d9429bd7 cmVisualStudioGeneratorOptions: Move XML code to subclasses

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1885
2018-03-27 07:50:55 -04:00
Brad King b9788dc5a3 Merge topic 'revert-CTestTestfile-removal-again'
70c50aa23c Revert "Remove CTestTestfile.cmake when BUILD_TESTING is OFF"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1887
2018-03-27 07:49:28 -04:00
Kitware Robot 82b0316e0a CMake Nightly Date Stamp 2018-03-27 00:01:05 -04:00
Brad King 8dc97acb03 cmake_minimum_required: Tolerate unknown future arguments
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).
2018-03-26 11:31:08 -04:00
Vitaly Stakhovsky a0d9429bd7 cmVisualStudioGeneratorOptions: Move XML code to subclasses 2018-03-26 09:35:58 -04:00
Brad King 6792c7787a Merge topic 'UseSWIG-fix-library-prefix'
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
2018-03-26 08:01:57 -04:00
Brad King 0e323aad43 Merge topic 'bootstrap-var-options'
850cfe3a3b bootstrap: Add support for VAR=value options to specify tools and flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1859
2018-03-26 08:01:00 -04:00
Brad King ee78f4e1da Merge topic 'pr.checksymbol'
20c204244b CheckSymbolExists: Fix CMP0054 warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1884
2018-03-26 08:00:21 -04:00
Brad King 911972903b Merge topic 'contract-plplot'
53e3080be3 Tests: Restore PLplot contract test repository https URL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1883
2018-03-26 07:58:22 -04:00
Brad King 89fd296ef2 Merge branch 'release-3.11' 2018-03-26 07:49:13 -04:00
Brad King 188c5c2a46 Merge branch 'revert-CTestTestfile-removal-again' into release-3.11
Merge-request: !1887
2018-03-26 07:48:15 -04:00
Brad King 70c50aa23c Revert "Remove CTestTestfile.cmake when BUILD_TESTING is OFF"
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.
2018-03-26 07:44:22 -04:00
Kitware Robot 2fd00f7668 CMake Nightly Date Stamp 2018-03-26 00:01:10 -04:00
Kitware Robot b080ac48c3 CMake Nightly Date Stamp 2018-03-25 00:01:04 -04:00
Kitware Robot 3dec341fe7 CMake Nightly Date Stamp 2018-03-24 00:01:13 -04:00
Craig Scott 23922f48cc Merge topic 'pr.find_package.prefixes'
4eb5d851d5 Help: Add 'lib32|libx32|lib64' paths to find_package prefixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1878
2018-03-23 05:11:18 -04:00
Kitware Robot 2614335a34 CMake Nightly Date Stamp 2018-03-23 00:01:09 -04:00
Vitaly Stakhovsky 85468e0754 cmComputeLinkInformation: make some members const 2018-03-22 18:31:29 -04:00
Craig Scott 9f2ec9d241 Merge topic 'list-sublist'
768225837d list: Add SUBLIST sub-command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1874
2018-03-22 15:27:24 -04:00
Craig Scott 82df2fe17e Merge topic 'policy-version-range'
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
2018-03-22 15:24:49 -04:00
Marc Chevrier 51b642679b UseSWIG: fix prefix library for Java on Windows
Fixes: #17836
2018-03-22 11:18:17 -04:00
James Lee 850cfe3a3b bootstrap: Add support for VAR=value options to specify tools and flags 2018-03-22 10:52:16 -04:00
Brad King 8aec07e057 Merge topic 'boost-1.67'
1673923c30 FindBoost: Add support for Boost 1.67 with Python version suffixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1865
2018-03-22 08:40:42 -04:00
Brad King 45ffb4ac79 Merge topic 'ccmake-revise-default'
99bf77f49c ccmake: Check for curses more robustly before enabling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1881
2018-03-22 08:39:26 -04:00
Brad King a5eb7d1c11 Merge topic 'vs-flags-improvement'
5697c6ae03 cmVisualStudioGeneratorOptions: Factor out an OutputFlag helper

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1862
2018-03-22 08:35:17 -04:00
Brad King d78d750c04 Merge topic 'clarify_inherited_properties'
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
2018-03-22 08:33:53 -04:00