Commit Graph

42770 Commits

Author SHA1 Message Date
Kitware Robot
2efecea485 CMake Nightly Date Stamp 2019-03-15 00:01:07 -04:00
Brad King
32a569e877 Merge topic 'refactor_cmfilecopier'
e2e8f6b132 cmFileCommand: Factor out cmFileCopier and cmFileInstaller

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2664
2019-03-14 11:13:33 -04:00
Brad King
7bc03aa6e2 Merge topic 'string_scopes'
3039fd7a29 cmDependsC: Use faster cmSystemTools::FileTimeCompare
b96c3c74dd cmDependsC: Use auto for long type names
e81b425019 cmDependsC: Remove useless string preallocation artifact
d1a54ee26a cmDepends: Reduce temporary object lifetime with local scopes
ae416a6b5c cmLocalUnixMakefileGenerator3: Use std::unique_ptr instead of new/delete
60a407b01c cmLocalUnixMakefileGenerator3: Pass strings instead of recomputing them
addd1ce402 cmLocalUnixMakefileGenerator3: Move local strings into local brace scopes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !3088
2019-03-14 11:12:44 -04:00
Brad King
9915003eae Merge topic 'import-zstd'
1761a9a546 CMake: Enable use of zstd in libarchive
2cf2921749 zstd: Add CMake build system
f92b4b52eb Merge branch 'upstream-zstd' into import-zstd
fbaf65639a zstd 2018-12-27 (470344d3)
9337cbfcca zstd: add script to import zstd from upstream

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Bartosz <gang65@poczta.onet.pl>
Merge-request: !3092
2019-03-14 11:08:43 -04:00
Brad King
101621ee52 Merge topic 'xcodescheme'
40be48f890 XCode: Add scheme option XCODE_SCHEME_DEBUG_AS_ROOT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3084
2019-03-14 11:07:53 -04:00
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
Bryon Bean
e2e8f6b132 cmFileCommand: Factor out cmFileCopier and cmFileInstaller
Split these classes out into their own sources.
2019-03-13 14:06:32 -04:00
Sebastian Holtermann
3039fd7a29 cmDependsC: Use faster cmSystemTools::FileTimeCompare
The file stat caching feature of the local cmFileTimeComparison instance is
unused in the addressed context.  To avoid the allocation and initialization
overhead of cmFileTimeComparison use cmSystemTools::FileTimeCompare instead.
2019-03-13 18:01:03 +01:00
Brad King
1761a9a546 CMake: Enable use of zstd in libarchive
Build zstd as part of CMake or find one on the system.  Modify our
port of libarchive to use the zstd configured for use with CMake.

Issue: #18657
2019-03-13 10:47:21 -04:00
Brad King
2cf2921749 zstd: Add CMake build system
Although the upstream has a CMake build system, it is meant for the
complete package.  Add a simple one to build just the static library
we need within CMake.
2019-03-13 10:47:16 -04:00
Brad King
f92b4b52eb Merge branch 'upstream-zstd' into import-zstd
* upstream-zstd:
  zstd 2018-12-27 (470344d3)
2019-03-13 10:46:32 -04:00
zstd upstream
fbaf65639a zstd 2018-12-27 (470344d3)
Code extracted from:

    https://github.com/facebook/zstd.git

at commit 470344d33e1d52a2ada75d278466da8d4ee2faf6 (v1.3.8).
2019-03-13 10:46:29 -04:00
Brad King
9337cbfcca zstd: add script to import zstd from upstream 2019-03-13 10:46:14 -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
Sebastian Holtermann
b96c3c74dd cmDependsC: Use auto for long type names 2019-03-12 11:44:44 +01:00
Sebastian Holtermann
e81b425019 cmDependsC: Remove useless string preallocation artifact 2019-03-12 11:41:56 +01:00
Sebastian Holtermann
d1a54ee26a cmDepends: Reduce temporary object lifetime with local scopes 2019-03-12 11:29:27 +01:00
Sebastian Holtermann
ae416a6b5c cmLocalUnixMakefileGenerator3: Use std::unique_ptr instead of new/delete 2019-03-12 11:02:22 +01:00
Sebastian Holtermann
60a407b01c cmLocalUnixMakefileGenerator3: Pass strings instead of recomputing them 2019-03-12 11:02:09 +01:00
Sebastian Holtermann
addd1ce402 cmLocalUnixMakefileGenerator3: Move local strings into local brace scopes 2019-03-12 11:01:48 +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
Harry Mallon
40be48f890 XCode: Add scheme option XCODE_SCHEME_DEBUG_AS_ROOT 2019-03-11 13:30:35 +00:00
Kitware Robot
7a30d72728 CMake Nightly Date Stamp 2019-03-11 00:01:05 -04:00