summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | | | | | Merge topic 'win-rel-qt5.12'Brad King2019-03-082-6/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Utilities/Release: Update to Qt 5.12 on Windows buildsBrad King2019-03-082-4/+12
| | | | | | | | |
| * | | | | | | | Utilities/Release: Update for using Windows 10 SDKBrad King2019-03-082-2/+2
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge branch 'release-3.14'Brad King2019-03-080-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | CMake 3.14.0-rc4v3.14.0-rc4Brad King2019-03-081-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'release-3.14'Brad King2019-03-080-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'cxx-checks-warning-match' into release-3.14Brad King2019-03-071-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3075
| * \ \ \ \ \ \ \ \ Merge branch 'install-no-imported-global' into release-3.14Brad King2019-03-075-1/+14
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3071
* | \ \ \ \ \ \ \ \ \ Merge topic 'install-no-imported-global'Brad King2019-03-085-1/+14
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 47389c5641 install: Do not crash on imported global target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3071
| * | | | | | | | | | install: Do not crash on imported global targetBrad King2019-03-075-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit e89ad0f94e (install: Allow installing targets created in another directory, 2018-06-18, v3.13.0-rc1~407^2) the `install(TARGETS)` command may find a global-scoped target outside the calling directory. Ignore an `IMPORTED GLOBAL` target if it is found in this way. Imported targets cannot be installed, and trying to do so violates internal invariants. Fixes: #19022
* | | | | | | | | | | Merge topic 'cxx-checks-warning-match'Brad King2019-03-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | / / / / / / / | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ca5a815f2 C++ feature checks: Match warnings more strictly Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3075
| * | | | | | | | | C++ feature checks: Match warnings more strictlyBrad King2019-03-071-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | CMake Nightly Date StampKitware Robot2019-03-081-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'doc-fix'Brad King2019-03-071-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d7ca0a2644 Help: add code-block directive Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3074
| * | | | | | | | | Help: add code-block directiveKyle Edwards2019-03-071-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge topic 'more_header_docs'Kyle Edwards2019-03-071-1/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 46c5830394 Help: provide example for HTTPHEADER option to ctest_submit Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3072
| * | | | | | | | | Help: provide example for HTTPHEADER option to ctest_submitZack Galbreath2019-03-071-1/+9
| | | | | | | | | |
* | | | | | | | | | Merge topic 'feature/cleanup-ctest'Kyle Edwards2019-03-073-21/+18
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1166aa5ce7 ctest: refactor some code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3064
| * | | | | | | | | ctest: refactor some codeGregor Jasny2019-03-053-21/+18
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'release-3.14'Brad King2019-03-070-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'vs-explicit-newline' into release-3.14Brad King2019-03-061-0/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3065
* | \ \ \ \ \ \ \ \ Merge topic 'vs-explicit-newline'Brad King2019-03-071-0/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | / / / / | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 0bf4418017 VS: Encode newlines in XML attributes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3065
| * | | | | | | | VS: Encode newlines in XML attributesLuca Cappa2019-03-061-0/+1
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encode `\n` as `&#10;` to avoid generating a literal newline inside an XML attribute. This is more readable and also fixes custom commands in `.csproj` files with VS 2019 RC. Fixes: #19001
* | | | | | | | CMake Nightly Date StampKitware Robot2019-03-071-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'release-3.14'Brad King2019-03-060-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'docs-xcode-schemes' into release-3.14Brad King2019-03-063-34/+29
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3066
* | \ \ \ \ \ \ \ Merge topic 'docs-xcode-schemes'Brad King2019-03-063-34/+29
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d0cb912a28 Help: Remove note that Xcode scheme generator is experimental de850fe385 Help: Trivial typo fix for CMAKE_XCODE_GENERATE_SCHEME d61a5a20ef Help: Sort lists of (CMAKE_)XCODE_SCHEME_... variables and properties Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3066
| * | | | | | | | Help: Remove note that Xcode scheme generator is experimentalCraig Scott2019-03-061-5/+0
| | | | | | | | |