Commit Graph

42751 Commits

Author SHA1 Message Date
Brad King accbf41da5 Merge topic 'short-commands'
077ab5774c cmake: add short version of '--target <tgt>...' option
071f5e1544 cmake: Reformat '--parallel' and '--verbose' options in help

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3078
2019-03-14 11:06:19 -04:00
Brad King 46ad0f7e9d Merge branch 'release-3.14' 2019-03-14 10:28:16 -04:00
Brad King bf02d62532 CMake 3.14.0 v3.14.0 2019-03-14 09:08:05 -04:00
Kitware Robot e1af2489fd CMake Nightly Date Stamp 2019-03-14 00:01:08 -04:00
Brad King 80b761b924 Merge topic 'update-documentation'
da2e588935 cmake: Upgrade 'cmake -E' commands description

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3089
2019-03-13 10:19:21 -04:00
Brad King 7b81b1c72c Merge topic 'cuda_compiler_generator_expressions'
b53766b205 CUDA: Support compiler id and version generator expressions
b544e34af6 All VersionNode use the same capitalization pattern

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3085
2019-03-13 10:16:25 -04:00
Brad King 40ad7cabc6 Merge topic 'ignore-json-deprecated-warnings'
2c280acdf8 JsonCpp: Ignore deprecation warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3091
2019-03-13 10:15:10 -04:00
Brad King c0f53f743e Merge branch 'release-3.14' 2019-03-13 10:12:53 -04:00
Brad King 61023e0b8f Merge branch 'release-3.13' 2019-03-13 10:12:51 -04:00
Brad King 1b8c5a0c35 Merge topic 'revert-vs-msbuild-arch'
f3cedf381e VS: Revert "Use MSBuild matching toolset host architecture"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3090
2019-03-13 10:08:57 -04:00
Brad King d7c4a8ab81 Merge topic 'wix-cmake-downgrade-fix'
7593bdf4e8 CMake: Fix WiX installer downgrades with versioned binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3087
2019-03-13 10:08:03 -04:00
Kitware Robot f74bb6527e CMake Nightly Date Stamp 2019-03-13 00:01:07 -04:00
Chuck Atkins 2c280acdf8 JsonCpp: Ignore deprecation warnings 2019-03-12 17:14:02 +00:00
Brad King 1b6a3047c6 Merge branch 'revert-vs-msbuild-arch' into release-3.14
Merge-request: !3090
2019-03-12 13:01:57 -04:00
Brad King f3cedf381e VS: Revert "Use MSBuild matching toolset host architecture"
Revert commit da402a081b (VS: Use MSBuild matching toolset host
architecture, 2019-01-28, v3.14.0-rc1~50^2).  Multiple people have
reported that the 64-bit `amd64/msbuild` tool fails in cases that the
32-bit `msbuild` works.  Drop our change pending further investigation
and hopefully a fix to VS.

Fixes: #18904, #19037
Issue: #18219
2019-03-12 12:53:06 -04:00
Bartosz Kosiorek da2e588935 cmake: Upgrade 'cmake -E' commands description
Fixes: #13204
2019-03-12 16:01:33 +01:00
Brad King 57d178bbca Merge topic 'FindBoost-dyn-link'
05774d4b58 FindBoost: always define BOOST_ALL_DYN_LINK for Boost::dynamic_linking

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3083
2019-03-12 09:54:23 -04:00
Brad King 5822a7bed2 Merge topic 'shell_path'
463c2fba4e Genex: Teach SHELL_PATH to support a list of paths
21da25d2a8 Tests: Generalize GeneratorExpression MSYS path conversion workaround

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3057
2019-03-12 09:53:27 -04:00
Brad King 0c2469e3fb Merge branch 'wix-cmake-downgrade-fix' into release-3.13
Merge-request: !3087
2019-03-12 09:42:02 -04:00
Brad King 225675b1a2 Merge branch 'wix-cmake-downgrade-fix' into release-3.14
Merge-request: !3087
2019-03-12 09:41:37 -04:00
Nils Gladitz 7593bdf4e8 CMake: Fix WiX installer downgrades with versioned binaries
Since commit 5b9da05b7a (Windows: Embed version information into CMake
binaries, 2017-10-25, v3.11.0-rc1~411^2) our binaries have version
information that prevents a `.msi` downgrade from replacing them by
default.  Configure the re-install mode:

* a: reinstall all files regardless of version
* m: rewrite all per-machine registry entries
* u: rewrite all per-user registry entries
* s: reinstall shortcuts and icons

Fixes: #19006
2019-03-12 09:39:35 -04:00
Bartosz Kosiorek 077ab5774c cmake: add short version of '--target <tgt>...' option 2019-03-12 12:00:09 +01:00
Bartosz Kosiorek 071f5e1544 cmake: Reformat '--parallel' and '--verbose' options in help 2019-03-12 11:59:16 +01:00
Kitware Robot 7358f317e3 CMake Nightly Date Stamp 2019-03-12 00:01:07 -04:00
NeroBurner 05774d4b58 FindBoost: always define BOOST_ALL_DYN_LINK for Boost::dynamic_linking
The purpose of the `Boost::dynamic_linking` interface library is to
cause `BOOST_ALL_DYN_LINK` to be defined.  Do this on all platforms
instead of just Windows.

In particular, using Boost::log trivial_logger requires to set
BOOST_ALL_NO_LIB when Boost::Log is compiled as dynamic library.

Fixes: #17813
2019-03-11 13:24:51 -04:00
Robert Maynard b53766b205 CUDA: Support compiler id and version generator expressions
Introduce the CUDA_COMPILER_ID and CUDA_COMPILER_VERSION generator
expressions.
2019-03-11 12:33:43 -04:00
Robert Maynard b544e34af6 All VersionNode use the same capitalization pattern 2019-03-11 11:48:37 -04:00
Henri Manson 463c2fba4e Genex: Teach SHELL_PATH to support a list of paths
Extend the genex added by commit ca6ba3fee5 (Genex: Add a SHELL_PATH
expression, 2015-09-24, v3.4.0-rc1~37^2) to accept a `;`-list of paths,
convert them all, and generate a list separated by the native shell
`PATH``` separator.
2019-03-11 11:39:25 -04:00
Brad King 21da25d2a8 Tests: Generalize GeneratorExpression MSYS path conversion workaround
Use MSYS2's `MSYS2_ARG_CONV_EXCL` environment variable to prevent
path conversion where possible.
2019-03-11 11:37:52 -04:00
Brad King 06a59f1bda Merge topic 'FindSWIG-advanced-exe'
4fe56a67d9 FindSWIG: mark_as_advanced SWIG_EXECUTABLE for cleaner cache display

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3077
2019-03-11 10:15:31 -04:00
Kitware Robot 7a30d72728 CMake Nightly Date Stamp 2019-03-11 00:01:05 -04:00
Kitware Robot 5c106bfc42 CMake Nightly Date Stamp 2019-03-10 00:01:05 -05:00
Kitware Robot ba3e8f9166 CMake Nightly Date Stamp 2019-03-09 00:01:09 -05:00
Brad King ec459c10c4 Merge topic 'optimize-properties-processing'
6ae5fffd0f Optimize target properties processing at generation step

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3062
2019-03-08 09:39:43 -05:00
Brad King 42bbde4193 Merge topic 'cmalgorithm-modernize-cmremoveduplicates'
bf1e73305a cmAlgorithms: Refactor cmRemoveDuplicates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3029
2019-03-08 09:38:54 -05:00
Brad King 18ff7cc34f Merge topic 'enable_testing'
538e699e5a Help: for command enable_testing, explain relation to module CTest.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3070
2019-03-08 09:37:56 -05:00
Brad King 8145876a1f Merge topic 'find-pthread-update'
d53317130e FindThreads: Use complete program to test for pthreads in libc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3040
2019-03-08 09:36:35 -05:00
Brad King 9b2665fc2c Merge topic 'win-rel-qt5.12'
adba2945b3 Utilities/Release: Update to Qt 5.12 on Windows builds
58426958ab Utilities/Release: Update for using Windows 10 SDK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3079
2019-03-08 09:35:28 -05:00
Brad King 89215c8ccf Merge branch 'release-3.14' 2019-03-08 09:06:59 -05:00
Brad King f96f1aa571 CMake 3.14.0-rc4 v3.14.0-rc4 2019-03-08 07:34:57 -05:00
Brad King 93e19df1df Merge branch 'release-3.14' 2019-03-08 07:33:57 -05:00
Brad King c2a3a945a5 Merge topic 'install-no-imported-global'
47389c5641 install: Do not crash on imported global target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3071
2019-03-08 07:32:48 -05:00
Brad King b7a861647e Merge topic 'cxx-checks-warning-match'
4ca5a815f2 C++ feature checks: Match warnings more strictly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3075
2019-03-08 07:31:36 -05:00
Brad King adba2945b3 Utilities/Release: Update to Qt 5.12 on Windows builds 2019-03-08 07:23:55 -05:00
Brad King 58426958ab Utilities/Release: Update for using Windows 10 SDK
In commit e903a9fc55 (Utilities/Release: Create a Windows 64-bit binary,
2016-03-16, v3.6.0-rc1~235^2~2) we added a `_USING_V110_SDK71_` macro to
tell the MSVC standard library headers they were using an older SDK.
The environment in which our Windows binaries are produced has been
updated to use a Windows 10 SDK now that we do not need to support
WinXP, so we can drop the definition.
2019-03-08 07:23:55 -05:00
Sylvain Joubert 4fe56a67d9 FindSWIG: mark_as_advanced SWIG_EXECUTABLE for cleaner cache display 2019-03-08 09:12:51 +01:00
Kitware Robot b90cab5bff CMake Nightly Date Stamp 2019-03-08 00:01:08 -05:00
Brad King 0e2804b9ba Merge branch 'cxx-checks-warning-match' into release-3.14
Merge-request: !3075
2019-03-07 15:00:26 -05:00
Brad King 4ca5a815f2 C++ feature checks: Match warnings more strictly
Require the word "warning" to appear at the start of a line, after
whitespace, or after a `:`.  This is the same that CTest launchers use
to match warnings.  It avoids matching "warning" inside file paths.

Fixes: #19019
2019-03-07 14:55:54 -05:00
Brad King 8c998e7523 Merge topic 'doc-fix'
d7ca0a2644 Help: add code-block directive

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3074
2019-03-07 14:49:27 -05:00