Commit Graph
47352 Commits
Author SHA1 Message Date
Brad King 32a483187a Merge branch 'release-3.16' 2019-11-05 11:32:00 -05:00
Brad King 3c0a317a1d Merge branch 'findpostgres-10-and-older' into release-3.16
Merge-request: !3993
2019-11-05 11:31:24 -05:00
Brad King 0ec60a4002 Merge branch 'source_group-tree' into release-3.16
Merge-request: !3979
2019-11-05 11:31:16 -05:00
Brad King 408a3a7d5e Merge branch 'objc-pch' into release-3.16
Merge-request: !3983
2019-11-05 11:31:10 -05:00
Brad King 602189bb7b Merge branch 'clarify_compile_features_documentation' into release-3.16
Merge-request: !3988
2019-11-05 11:31:03 -05:00
Brad King 2d83709038 Merge branch 'docs-INSTALL_REMOVE_ENVIRONMENT_PATH' into release-3.16
Merge-request: !3985
2019-11-05 11:30:56 -05:00
Brad King cb165b8b79 Merge topic 'source_group-tree'
3c0ca5a9d9 source_group: ensure that passed file is not a directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3979
2019-11-05 11:30:27 -05:00
Brad King a269c77edb Merge topic 'clarify_compile_features_documentation'
53cd86ea78 Help: Clarify what 'aware' means as it relates to C++ standards

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3988
2019-11-05 11:29:39 -05:00
Brad King 13ea5f06fa Merge topic 'objc-pch'
e331367a89 PCH: Add support for OBJC/OBJCXX languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3983
2019-11-05 11:24:55 -05:00
Brad King 3521e3d524 Merge topic 'findpostgres-10-and-older'
e992d62b7e FindPostgreSQL: support version encoding used in pre-10 releases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3993
2019-11-05 11:23:59 -05:00
Brad King 153226a147 Merge topic 'FindCUDA-find-nvcc'
2e9feddf68 FindCUDA: Use find_program instead of find_path when searching for nvcc.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3990
2019-11-05 11:23:04 -05:00
Brad King 20fdf9a92b Merge topic 'docs-INSTALL_REMOVE_ENVIRONMENT_PATH'
dd05ef429a Help: Fix inaccuracies in INSTALL_REMOVE_ENVIRONMENT_RPATH docs
ac8de0dbcf RPATH: Remove stray indent in generated file(RPATH_CHANGE) command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3985
2019-11-05 11:21:25 -05:00
Brad King 57db062414 Merge topic 'ctest-repeat-until-pass'
30e79bb4a3 Tests: Extend RunCMake.CTestCommandLine internal timeout for valgrind

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3987
2019-11-05 10:55:41 -05:00
Craig Scott b089396f8e Merge branch 'release-3.16' 2019-11-05 23:20:14 +11:00
Craig Scott c831e409a5 Merge branch 'add_CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY' into release-3.16
Merge-request: !3968
2019-11-05 23:19:14 +11:00
Craig Scott abb0119350 Merge topic 'add_CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY'
55df3954d3 find_package: Add support for CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3968
2019-11-05 07:17:17 -05:00
Kitware Robot 003e1f992e CMake Nightly Date Stamp 2019-11-05 00:01:08 -05:00
Kyle Edwards a0e2e0ca97 Help: Add documentation and release notes for INSTALL_NAME_DIR genex 2019-11-04 19:02:16 -05:00
Kyle Edwards deeab72aae Tests: Add tests for INSTALL_NAME_DIR 2019-11-04 19:02:16 -05:00
Hong Xu 2e9feddf68 FindCUDA: Use find_program instead of find_path when searching for nvcc.
Before this commit, nvcc would not be found if it is in env PATH but a
non-standard location. This commit fixes this issue.
2019-11-04 14:17:20 -08:00
Robert Maynard 53cd86ea78 Help: Clarify what 'aware' means as it relates to C++ standards 2019-11-04 17:16:57 -05:00
Ben Boeckel e992d62b7e FindPostgreSQL: support version encoding used in pre-10 releases
With the 10.x release, PostgreSQL upstream started encoding the version
as `MMmmmm` where `M` is major and `m` is minor. Prior to that, `MMmmPP`
was used where `P` was the patch number. Detect this difference and
decode it based on the used encoding.

Fixes: #19912
2019-11-04 16:38:52 -05:00
Brad King 2654a2e999 Merge topic 'FindCUDA-find-nvcc'
f4eebeb447 FindCUDA: Revert "Use find_program instead of find_path to find nvcc"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3991
2019-11-04 14:53:45 -05:00
Brad King f4eebeb447 FindCUDA: Revert "Use find_program instead of find_path to find nvcc"
Revert commit 067ee518f7 (FindCUDA: Use find_program instead of
find_path to find nvcc, 2019-10-31).  It causes `CUDA_TOOLKIT_ROOT_DIR`
to contain the path to nvcc rather than the toolkit directory.
2019-11-04 14:50:04 -05:00
Craig Scott 9667996923 Merge topic 'message-check-types'
7b2dd9dedc Refactor: Use added message types in various modules
949a1e120a message: New message types to mark checks performed by CMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3689
2019-11-04 14:11:45 -05:00
Sylvain Joubert d5d5ba3f7f ccmake: Identify the current cache entry 2019-11-04 20:06:51 +01:00
Mateusz Janek 3c0ca5a9d9 source_group: ensure that passed file is not a directory
Fixes: #19769
2019-11-04 13:37:41 -05:00
Sylvain Joubert 005aba29a1 ccmake: Improve display of the key controls
Reduce space usage and add the key to display the output
2019-11-04 18:59:20 +01:00
Sylvain Joubert 93b66735ac ccmake: Use type-based colors to display cache values
The colors are based on the entry type (or value for booleans),
paths and filepaths sharing the same color.
2019-11-04 18:59:20 +01:00
Johnny Jazeix 82ddcf0db1 MinGW Makefiles: do not fail if sh.exe is present in the path
The check was added only to fail early in an environment known not to work
at the time:

* https://web.archive.org/web/20120912010035/http://lists.trolltech.com/qt-interest/2006-01/thread00091-0.html

Fixes: #19327
2019-11-04 12:03:48 -05:00
Kyle Edwards 3c85f11fed INSTALL_NAME_DIR: Add support for generator expressions 2019-11-04 12:01:05 -05:00
Brad King 30e79bb4a3 Tests: Extend RunCMake.CTestCommandLine internal timeout for valgrind
A case added by commit 39ac8b4eb5 (ctest: Add --repeat-after-timeout
option, 2019-10-29) includes a success-case timeout of 2 seconds.  That
is too short when running under valgrind, so extend it to 5 seconds.
2019-11-04 11:22:58 -05:00
Robert Maynard 55df3954d3 find_package: Add support for CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY
Extend the change from commit 1d00ba9ccf (Find: find_package prefers
variable CMAKE_FIND_USE_REGISTRY, 2018-11-13, v3.16.0-rc1~461^2~1)
to cover the system package registry too.

Fixes: #19890
2019-11-04 10:31:16 -05:00
Brad King dbd14ecacf Merge topic 'FindPython-customize-failure-message'
687a354518 FindPython: customize failure message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3970
2019-11-04 10:30:39 -05:00
Brad King 5c3c228570 Merge topic 'cpack_absolute_package_directory'
63c0bc9292 CPack: Ensure CPACK_PACKAGE_DIRECTORY is an absolute path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3946
2019-11-04 10:29:44 -05:00
Brad King 70307b9351 Merge branch 'release-3.16' 2019-11-04 10:28:14 -05:00
Brad King e123cfec09 Merge branch 'tutorial-cleanup' into release-3.16
Merge-request: !3984
2019-11-04 10:27:25 -05:00
Brad King bd1f350883 Merge branch 'root-dir-assertion-fix' into release-3.16
Merge-request: !3976
2019-11-04 10:27:18 -05:00
Brad King 9decc17a23 Merge branch 'FindwxWidgets-wxwin-313' into release-3.16
Merge-request: !3972
2019-11-04 10:27:10 -05:00
Brad King 721b99defc Merge branch 'update-compile-feature-supported-compiler-list' into release-3.16
Merge-request: !3974
2019-11-04 10:27:02 -05:00
Brad King 94d669ecc7 Merge branch 'fix_load_cache_docs' into release-3.16
Merge-request: !3971
2019-11-04 10:26:52 -05:00
Brad King abac3a31a2 Merge topic 'root-dir-assertion-fix'
0692eaf0fe ForceToRelativePath: Fix spurious assertion when local path is root dir

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3976
2019-11-04 10:24:31 -05:00
Brad King b30701f045 Merge topic 'FindwxWidgets-wxwin-313'
f805cdd261 FindwxWidgets: Add support for 3.1.3 VS binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3972
2019-11-04 10:23:46 -05:00
Brad King accbaf5f73 Merge topic 'update-compile-feature-supported-compiler-list'
b7955bd931 Help: Remove out of date bounds on compile feature supported versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3974
2019-11-04 10:22:29 -05:00
Brad King 543ceb9d9e Merge topic 'fix_load_cache_docs'
657fb0aa6f Help: Clarify load_cache documentation of first parameter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3971
2019-11-04 10:21:27 -05:00
Brad King 6416753f32 Merge topic 'tutorial-cleanup'
9682adb6ad Tutorial: clean up typos, grammar and formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3984
2019-11-04 10:20:34 -05:00
Brad King cae17f7208 Merge topic 'FindCUDA-find-nvcc'
067ee518f7 FindCUDA: Use find_program instead of find_path to find nvcc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3973
2019-11-04 10:13:27 -05:00
Brad King 1463cfb437 Merge topic 'pgi-license-warnings'
59673bb2dc Tests: Teach RunCMake to ignore PGI license expiry warnings
210d04bb79 CTestCustom: Suppress PGI Community Edition compiler license warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3975
2019-11-04 10:12:26 -05:00
Craig Scott dd05ef429a Help: Fix inaccuracies in INSTALL_REMOVE_ENVIRONMENT_RPATH docs
The previous docs assumed one had to set INSTALL_RPATH for
this target property to have an effect, but the actual condition is
only that the install rpath is different to the build rpath. Even if
the install rpath is empty, it is possible that CMake will rewrite
the rpath during install because the build rpath could be
non-empty.
2019-11-04 17:02:57 +11:00
Craig Scott ac8de0dbcf RPATH: Remove stray indent in generated file(RPATH_CHANGE) command 2019-11-04 16:26:42 +11:00