summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'import-zstd'Brad King2019-03-1471-10/+31230
|\ | | | | | | | | | | | | | | | | | | | | | | 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
| * CMake: Enable use of zstd in libarchiveBrad King2019-03-138-10/+38
| | | | | | | | | | | | | | 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
| * zstd: Add CMake build systemBrad King2019-03-131-0/+44
| | | | | | | | | | | | 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.
| * Merge branch 'upstream-zstd' into import-zstdBrad King2019-03-1361-0/+31112
| |\ | | | | | | | | | | | | * upstream-zstd: zstd 2018-12-27 (470344d3)
| | * zstd 2018-12-27 (470344d3)zstd upstream2019-03-1361-0/+31112
| | | | | | | | | | | | | | | | Code extracted from: https://github.com/facebook/zstd.git at commit 470344d33e1d52a2ada75d278466da8d4ee2faf6 (v1.3.8).
| * zstd: add script to import zstd from upstreamBrad King2019-03-131-0/+36
| |
* | Merge topic 'xcodescheme'Brad King2019-03-145-0/+15
|\ \ | | | | | | | | | | | | | | | | | | 40be48f890 XCode: Add scheme option XCODE_SCHEME_DEBUG_AS_ROOT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3084
| * | XCode: Add scheme option XCODE_SCHEME_DEBUG_AS_ROOTHarry Mallon2019-03-115-0/+15
| | |
* | | Merge topic 'short-commands'Brad King2019-03-144-11/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | cmake: add short version of '--target <tgt>...' optionBartosz Kosiorek2019-03-124-5/+13
| | | |
| * | | cmake: Reformat '--parallel' and '--verbose' options in helpBartosz Kosiorek2019-03-122-7/+7
| | | |
* | | | Merge branch 'release-3.14'Brad King2019-03-140-0/+0
|\ \ \ \
| * | | | CMake 3.14.0v3.14.0Brad King2019-03-141-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2019-03-141-1/+1
| | | | |
* | | | | Merge topic 'update-documentation'Brad King2019-03-132-6/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da2e588935 cmake: Upgrade 'cmake -E' commands description Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3089
| * | | | | cmake: Upgrade 'cmake -E' commands descriptionBartosz Kosiorek2019-03-122-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #13204
* | | | | | Merge topic 'cuda_compiler_generator_expressions'Brad King2019-03-134-2/+70
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | CUDA: Support compiler id and version generator expressionsRobert Maynard2019-03-114-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce the CUDA_COMPILER_ID and CUDA_COMPILER_VERSION generator expressions.
| * | | | | | All VersionNode use the same capitalization patternRobert Maynard2019-03-111-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge topic 'ignore-json-deprecated-warnings'Brad King2019-03-131-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c280acdf8 JsonCpp: Ignore deprecation warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3091
| * | | | | | JsonCpp: Ignore deprecation warningsChuck Atkins2019-03-121-0/+4
| | | | | | |
* | | | | | | Merge branch 'release-3.14'Brad King2019-03-130-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'revert-vs-msbuild-arch' into release-3.14Brad King2019-03-121-12/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3090
| * \ \ \ \ \ \ Merge branch 'wix-cmake-downgrade-fix' into release-3.14Brad King2019-03-121-0/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3087
* | \ \ \ \ \ \ \ Merge branch 'release-3.13'Brad King2019-03-130-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'wix-cmake-downgrade-fix' into release-3.13Brad King2019-03-121-0/+2
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | Merge-request: !3087
* | | | | | | | | | Merge topic 'revert-vs-msbuild-arch'Brad King2019-03-131-12/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f3cedf381e VS: Revert "Use MSBuild matching toolset host architecture" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3090
| * | | | | | | | | VS: Revert "Use MSBuild matching toolset host architecture"Brad King2019-03-121-12/+0
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge topic 'wix-cmake-downgrade-fix'Brad King2019-03-131-0/+2
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7593bdf4e8 CMake: Fix WiX installer downgrades with versioned binaries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3087
| * | | | | | | | CMake: Fix WiX installer downgrades with versioned binariesNils Gladitz2019-03-121-0/+2
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | CMake Nightly Date StampKitware Robot2019-03-131-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge topic 'FindBoost-dyn-link'Brad King2019-03-121-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05774d4b58 FindBoost: always define BOOST_ALL_DYN_LINK for Boost::dynamic_linking Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3083
| * | | | | | | FindBoost: always define BOOST_ALL_DYN_LINK for Boost::dynamic_linkingNeroBurner2019-03-111-2/+2
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge topic 'shell_path'Brad King2019-03-127-12/+78
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Genex: Teach SHELL_PATH to support a list of pathsHenri Manson2019-03-117-4/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Tests: Generalize GeneratorExpression MSYS path conversion workaroundBrad King2019-03-112-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use MSYS2's `MSYS2_ARG_CONV_EXCL` environment variable to prevent path conversion where possible.
* | | | | | | CMake Nightly Date StampKitware Robot2019-03-121-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge topic 'FindSWIG-advanced-exe'Brad King2019-03-111-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4fe56a67d9 FindSWIG: mark_as_advanced SWIG_EXECUTABLE for cleaner cache display Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3077
| * | | | | FindSWIG: mark_as_advanced SWIG_EXECUTABLE for cleaner cache displaySylvain Joubert2019-03-081-1/+1
| | |_|_|/ | |/| | |
* | | | | CMake Nightly Date StampKitware Robot2019-03-111-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2019-03-101-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2019-03-091-1/+1
| | | | |
* | | | | Merge topic 'optimize-properties-processing'Brad King2019-03-081-67/+159
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6ae5fffd0f Optimize target properties processing at generation step Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3062
| * | | | | Optimize target properties processing at generation stepMarc Chevrier2019-03-071-67/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid creating unnecessary `cmCompileGeneratorExpression` instances. Use runtime polymorphism to avoid the full genex infrastructure when a property value does not contain a genex. Issue: #18965
* | | | | | Merge topic 'cmalgorithm-modernize-cmremoveduplicates'Brad King2019-03-081-18/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf1e73305a cmAlgorithms: Refactor cmRemoveDuplicates Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3029
| * | | | | | cmAlgorithms: Refactor cmRemoveDuplicatesArtur Ryt2019-03-061-18/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use an iterator-based implementation with range-based one simply deferring to it. Also optimize a little by storing iterators to unique values to prevent creating value copies.
* | | | | | | Merge topic 'enable_testing'Brad King2019-03-082-5/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 538e699e5a Help: for command enable_testing, explain relation to module CTest. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3070
| * | | | | | | Help: for command enable_testing, explain relation to module CTest.Joachim Wuttke (o)2019-03-072-5/+13
| | | | | | | |
* | | | | | | | Merge topic 'find-pthread-update'Brad King2019-03-081-6/+35
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d53317130e FindThreads: Use complete program to test for pthreads in libc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3040
| * | | | | | | | FindThreads: Use complete program to test for pthreads in libcJerryShih2019-03-061-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our check for just `pthread_create` is not sufficient because there are cases where that symbol may be found in libc but not all of pthreads. We first tried to address this in commit e9a1ddc594 (FindThreads: Replace the pthread symbol checking in libc., 2018-11-18, v3.14.0-rc1~292^2) by switching to `pthread_kill`, but that had to be reverted by commit 18320230ec (FindThreads: Revert libc symbol check to pthread_create, 2019-02-27, v3.14.0-rc3~6^2) because there are other cases where `pthread_kill` is in libc but the rest of pthreads is not. Update our check to try a complete program using pthreads as an actual application might. Fixes: #18994