Commit Graph

39111 Commits

Author SHA1 Message Date
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
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
Kitware Robot 9b3d3952a8 CMake Nightly Date Stamp 2018-03-22 00:01:06 -04: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
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
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
Rolf Eike Beer dc863592bc WCDH: use better fallback value for nullptr with old gcc versions
GCC supports the __null builtin basically forever (since at least 2.95), which
behaves very much like nullptr later does. Use this instead of plain "0" as
fallback value, otherwise passing the define to functions annotated with
__attribute__((sentinel)) will result in a compiler warning.
2018-03-20 22:01:48 +01:00
Henry Fredrick Schreiner e743fc8e91 FindCUDA/select_compute_arch: Add support for CUDA as a language
Even though this is an internal module, we can still prepare it to
be used in another public-facing module outside of `FindCUDA`.

Issue: #16586
2018-03-20 14:19:25 -04:00
Vitaly Stakhovsky 5697c6ae03 cmVisualStudioGeneratorOptions: Factor out an OutputFlag helper 2018-03-20 14:10:04 -04:00
Ruslan Baratov 3af1daa186 Help: Document target_compile_definitions handling of -D
Add an example of using the `target_compile_definitions` command and a
note about usage of ``-D`` in items.
2018-03-20 14:06:15 -04:00
Brad King 4267960fc9 Features: Record for SunPro 5.15
Oracle Developer Studio 12.6 adds support for more C++ 11 features.
2018-03-20 11:48:22 -04:00
Brad King 3b7be02480 ccmake: Fix compilation with ncurses on Solaris
On Solaris the ncurses header may define an `__attribute__` macro.
This breaks C++ headers that use `__attribute__(...)` syntax.
Somehow it causes references to unresolved symbols:

    __gthrw_pthread_once
    __gthrw_pthread_mutex_lock
    __gthrw_pthread_mutex_unlock

instead of references to the correct symbols:

    pthread_once
    pthread_mutex_lock
    pthread_mutex_unlock

Detect this case and undefine the `__attribute__` macro after
including the curses headers.
2018-03-20 11:39:28 -04:00
Brad King 1c3bbda2f2 Merge topic 'pr.install_name_dir'
16eaf2d271 Help: Reference CMAKE_INSTALL_NAME_DIR from INSTALL_NAME_DIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !1872
2018-03-20 09:43:22 -04:00
Brad King d41abae70f Merge topic 'list-join'
a58158727b list(): add `JOIN` sub-command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1846
2018-03-20 09:40:40 -04:00
Ruslan Baratov 16eaf2d271 Help: Reference CMAKE_INSTALL_NAME_DIR from INSTALL_NAME_DIR 2018-03-20 16:34:45 +03:00
Marc Chevrier a58158727b list(): add JOIN sub-command 2018-03-20 14:28:17 +01:00
Brad King 3b99c9689a Merge topic 'FindwxWidgets-msvc-v141'
73738f620f FindwxWidgets: Add support for MSVC versions of the v141 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1861
2018-03-20 09:21:49 -04:00
Brad King 157ae9a088 Merge topic 'make_GetItems_const'
8e20ad1a5e cmComputeLinkInformation: make GetItems() const

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1863
2018-03-20 09:21:02 -04:00
Brad King f5f992b6f0 Merge topic 'vs-indentfix'
b82ad18fe0 cmVisualStudio10TargetGenerator: fix indentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1868
2018-03-20 09:19:26 -04:00
tsecer harry 8c0f12c4aa Makefile: Restore use of dependency scanning cache
Since commit v2.8.0~27 (Major optimization of C/C++ dependency scanning,
2009-09-23) our `VaildDeps` cache of `depend.internal` content is
supposed to avoid re-scanning dependencies of object files whose
dependencies have not changed.  However, this was broken by changes to
`cmDependsC::WriteDependencies` by commit v3.1.0-rc1~272^2~1 (cmDepends:
Refactor object file path conversion, 2014-07-22).  The object file path
written to `depend.internal` was changed to a relative path, but the
lookup in the `ValidDeps` cache of that information was not updated too.
Therefore the cache is not used.

Fix the object file path used for the `ValidDeps` lookup to restore the
original optimization.
2018-03-20 08:40:04 -04:00
Marc Chevrier 50b5e9ed13 CMake build: Use new FindPython module 2018-03-20 09:29:55 +01:00
Marc Chevrier 352baee207 FindPython*: New implementation for Python stuff
Fixes: #16142
2018-03-20 09:29:44 +01:00
Kitware Robot 5831b6a2ae CMake Nightly Date Stamp 2018-03-20 00:01:08 -04:00
Adam Oleksy 73738f620f FindwxWidgets: Add support for MSVC versions of the v141 toolset
Since commit v3.8.0-rc3~7^2 (FindwxWidgets: Add support for VS 2017 v141
toolset, 2017-03-22) more MSVC updates have been released that use a
MSVC_VERSION value higher than 1910.  Revise our checks accordingly.

Issue: #16735
2018-03-19 11:56:00 -04:00
Brad King 882ba7fd11 Merge topic 'doc-set_target_properties-clarify'
89ee7ce3ea Help: Reference set_property from set_target_properties
c27e3e0f2b Help: Clarify that set_target_properties supports multiple targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1866
2018-03-19 11:18:31 -04:00
Brad King 7ba6f40bb2 Merge branch 'release-3.11' 2018-03-19 10:43:56 -04:00
Vitaly Stakhovsky b82ad18fe0 cmVisualStudio10TargetGenerator: fix indentation
Added printing empty string to get the right indentation.
2018-03-19 09:56:44 -04:00
Brad King 6b9172d759 CMake 3.11.0-rc4 v3.11.0-rc4 2018-03-19 09:25:26 -04:00
Brad King d8826406aa Merge branch 'release-3.11' 2018-03-19 09:24:37 -04:00
Brad King e35f4014f6 Merge topic 'revert-findqt4-dirs-fix'
cf06962d73 FindQt4: Revert "Set PLUGINS and IMPORTS dir even if empty"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1867
2018-03-19 09:22:53 -04:00
Brad King c78d12fc0d Merge branch 'revert-findqt4-dirs-fix' into release-3.11
Merge-request: !1867
2018-03-19 09:17:09 -04:00
Brad King cf06962d73 FindQt4: Revert "Set PLUGINS and IMPORTS dir even if empty"
The change in commit v3.11.0-rc1~306^2 (FindQt4: Set PLUGINS and IMPORTS
dir even if empty, 2017-11-19) regressed existing builds on some
machines.  Revert it for CMake 3.11 pending further investigation.

Fixes: #17814, #17817
Issue: #14155, #17492
2018-03-19 09:13:25 -04:00
Michael Stürmer 8e20ad1a5e cmComputeLinkInformation: make GetItems() const 2018-03-19 09:07:38 -04:00