mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-04 21:30:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
39,138 Commits 2 Branches 401 Tags
760f83d5c0d97359d1686ea4b56dabf2ac051a6d
Commit Graph

39138 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Brad King a7ac022425 Merge topic 'find-package_root-revise' 
3f479a3ca3 find_package: Improve CMP0074 warning messages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1880
 2018-03-22 08:32:54 -04:00
Ruslan Baratov 20c204244b CheckSymbolExists: Fix CMP0054 warning 2018-03-22 15:32:43 +03:00
Brad King 53e3080be3 Tests: Restore PLplot contract test repository https URL 
Switch back to the `https://` repository URL but without the `.git`
extensions.  It seems faster than the `git://` protocol for this server.
 2018-03-22 07:08:35 -04:00
Kitware Robot 9b3d3952a8 CMake Nightly Date Stamp 2018-03-22 00:01:06 -04:00
Ruslan Baratov 4eb5d851d5 Help: Add 'lib32|libx32|lib64' paths to find_package prefixes 
Document the conditions when 'lib32|libx32|lib64' variants will be added to the
list of possible installation prefixes.
 2018-03-21 20:59:09 +03:00
Brad King 99bf77f49c ccmake: Check for curses more robustly before enabling 
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.
 2018-03-21 13:57:45 -04:00
Brad King 218471a35c Merge branch 'boost-1.67' into release-3.11 
Merge-request: !1865
 2018-03-21 13:36:14 -04:00
Roger Leigh 1673923c30 FindBoost: Add support for Boost 1.67 with Python version suffixes 
Fixes: #16612, #16335, #16391, #12955
 2018-03-21 13:34:17 -04:00
Marc Chevrier 768225837d list: Add SUBLIST sub-command 
Issue: #17823
 2018-03-21 12:54:53 -04:00
Brad King a13cfa246f Merge topic 'FindPython-new-implementation' 
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
 2018-03-21 10:01:52 -04:00
Brad King 3946cbc505 Merge topic 'wcdh-gcc-null' 
dc863592bc WCDH: use better fallback value for nullptr with old gcc versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1877
 2018-03-21 09:26:37 -04:00
Brad King 948eb3b2bf Merge topic 'cuda_arch' 
e743fc8e91 FindCUDA/select_compute_arch: Add support for CUDA as a language

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1856
 2018-03-21 09:10:46 -04:00
Brad King 54ae5ee1d3 Merge topic 'pr.target_compile_definitions' 
3af1daa186 Help: Document target_compile_definitions handling of -D

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1873
 2018-03-21 09:08:58 -04:00
Brad King 87223a24f0 Merge topic 'makefile-fix-depend-optimization' 
8c0f12c4aa Makefile: Restore use of dependency scanning cache

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1870
 2018-03-21 09:08:10 -04:00
Brad King 64bb65777a Merge topic 'ccmake-solaris' 
3b7be02480 ccmake: Fix compilation with ncurses on Solaris

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1876
 2018-03-21 08:56:09 -04:00
Brad King debe4010a8 Merge branch 'release-3.11' 2018-03-21 08:54:35 -04:00
Brad King 2006e981da Merge branch 'sunpro-5.15' into release-3.11 
Merge-request: !1875
 2018-03-21 08:53:53 -04:00
Brad King cb794ac788 Merge topic 'sunpro-5.15' 
4267960fc9 Features: Record for SunPro 5.15

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1875
 2018-03-21 08:53:22 -04:00
Brad King 45408b5ea1 cmake_minimum_required: Optionally set policies with version range 
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.
 2018-03-21 08:00:28 -04:00
Brad King 3f479a3ca3 find_package: Improve CMP0074 warning messages 
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.
 2018-03-21 07:51:20 -04:00
Craig Scott ff6234509e Help: Clarify behavior of INHERITED properties 
Fixes: #17839
 2018-03-21 21:39:54 +11:00
Craig Scott 9cc97ab4dc Tests: Add tests for INHERITED property chaining 2018-03-21 21:38:47 +11:00
Kitware Robot 9fae23f703 CMake Nightly Date Stamp 2018-03-21 00:01:12 -04:00