summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'test-FindPkgConfig-isolate-env' into release-3.18Brad King2020-08-101-0/+5
|\ | | | | | | | | | | | | | | | | 8b12982653 Merge branch 'backport-test-FindPkgConfig-isolate-env' 4c939b0d39 Tests: Isolate RunCMake.FindPkgConfig from caller environment 20eeb40aaf Tests: Isolate RunCMake.FindPkgConfig from caller environment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5108
| * Merge branch 'backport-test-FindPkgConfig-isolate-env'Brad King2020-08-070-0/+0
| |\
| | * Tests: Isolate RunCMake.FindPkgConfig from caller environmentBrad King2020-08-071-0/+5
| | | | | | | | | | | | | | | Avoid interference from `CMAKE_PREFIX_PATH` and friends if they happen to be set in the environment from which the tests are run.
| * | Tests: Isolate RunCMake.FindPkgConfig from caller environmentBrad King2020-08-071-0/+5
| | | | | | | | | | | | | | | Avoid interference from `CMAKE_PREFIX_PATH` and friends if they happen to be set in the environment from which the tests are run.
* | | Merge topic 'reuse_pch_no_delay' into release-3.18Brad King2020-08-061-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ef97fbe6c2 PCH: Avoid unnecessary 30s delay on MSBuild Generator with REUSE_FROM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5102
| * | | PCH: Avoid unnecessary 30s delay on MSBuild Generator with REUSE_FROMCristian Adam2020-08-051-1/+1
| |/ / | | | | | | | | | | | | | | | | | | Fix logic added by commit 1f791eb160 (Multi-Ninja: Fix reusable PCHs for MSVC, 2020-05-24, v3.18.0-rc1~72^2) to avoid an unnecessary delay. Fixes: #21054
* | | Merge topic 'support_list_google_test_executor' into release-3.18Brad King2020-08-061-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8829d2caba GoogleTest: Restore support for list arguments in TEST_EXECUTOR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5084
| * | | GoogleTest: Restore support for list arguments in TEST_EXECUTORLaurits Riple2020-08-031-2/+2
| |/ / | | | | | | | | | | | | | | | Refactoring in commit 889a7146ff (GoogleTestAddTests: Refactor into callable method, 2020-03-16, v3.18.0-rc1~450^2~3) accidentally parsed `TEST_EXECUTOR` as a single-value argument instead of a list.
* | | Merge topic 'automoc_timestamp_deps' into release-3.18Brad King2020-08-068-3/+104
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a9ed4b9d3 Merge branch 'backport-3.17-automoc_timestamp_deps' 7445c9a58a AutoGen: Add test to check for correct AutoMoc dependencies a79056bb02 AutoGen: Fix over-specified direct dependencies of custom command Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Aleix <aleixpol@kde.org> Merge-request: !5085
| * \ \ Merge branch 'backport-3.17-automoc_timestamp_deps'Brad King2020-08-058-3/+104
| |\ \ \ | | |/ / | |/| |
| | * | AutoGen: Add test to check for correct AutoMoc dependenciesAlexandru Croitor2020-08-036-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | When using Qt 5.15.0 or above together with Ninja, check that touching a source file of a dependency does not needlessly re-run AUTOMOC for the dependee target.
| | * | AutoGen: Fix over-specified direct dependencies of custom commandAlexandru Croitor2020-08-032-3/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AutoMoc timestamp creating custom command explicitly depended on all dependencies of the origin target (associated to the AutoGen target). When an origin target depended on a shared library 'libfoo.so', if it was re-linked, the AutoMoc custom command would touch its output timestamp file, and thus cause needless rebuilding of sources, despite the shared library not having any influence on the AutoMoc generated files. Introduce a new '<target>_autogen_timestamp_deps' utility target, which will serve as an 'order-only' dependency for the custom command. This will prevent needless rebuilding, because touching 'libfoo.so' will not cause the custom command to be re-executed. The new AutoMoc dependency tree looks like: '_autogen_timestamp_deps (serves as order-only dep)' <- '<target_autogen>/timestamp' file ( + moc deps file) <- '<target>_autogen' target. Fixes: #21020
* | | | Merge topic 'ninja-multi-rsp-remove-path' into release-3.18Brad King2020-08-061-10/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | cdb50af2f6 Ninja: Restore shorter path to response files Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: alcroito <alexandru.croitor@qt.io> Merge-request: !5094
| * | | Ninja: Restore shorter path to response filesKyle Edwards2020-08-031-10/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 99ed39b011 (Ninja Multi-Config: Make link response files per-config, 2020-07-15, v3.17.4~3^2), we added the target directory to the response file under the mistaken assumption that two different targets with the same name could be in different directories. However, this causes the path to the response file to be too long to fit on a command line. Take the path back out, while leaving in the per-config split. Fixes: #21050
* | | CMake 3.18.1v3.18.1Brad King2020-07-301-1/+1
| | |
* | | Merge branch 'release-3.17' into release-3.18Brad King2020-07-300-0/+0
|\ \ \ | |/ /
| * | CMake 3.17.4v3.17.4Brad King2020-07-301-1/+1
| | |
| * | Merge branch 'bootstrap-intel' into release-3.17Brad King2020-07-241-1/+1
| |\ \ | | | | | | | | | | | | Merge-request: !5057
| * \ \ Merge branch 'backport-3.17-graphviz-restore-per-target' into release-3.17Brad King2020-07-215-7/+201
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !5039
| * \ \ \ Merge branch 'ninja-multi-rsp' into release-3.17Brad King2020-07-161-4/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !5020
| * \ \ \ \ Merge branch 'FindOpenSSL-3.0' into release-3.17Brad King2020-06-081-2/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !4860
* | \ \ \ \ \ Merge topic 'clang-msvc-cxx-std' into release-3.18Brad King2020-07-301-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 21e497fe63 Clang: Fix fallback compile features when simulating old MSVC versions Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !5082
| * | | | | | | Clang: Fix fallback compile features when simulating old MSVC versionsBrad King2020-07-291-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 25439c7d62 (Clang: Refactor CXX standard flags into __compiler_clang_cxx_standards(), 2020-03-16, v3.18.0-rc1~362^2~4) accidentally broke the `cxx_std_*` fallback feature names. Issue: #21033
* | | | | | | | Merge topic 'unity_no_skip_autogen' into release-3.18Brad King2020-07-305-1/+23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7051250a6c Unity Builds: Do not set SKIP_AUTOGEN to source files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5081
| * | | | | | | | Unity Builds: Do not set SKIP_AUTOGEN to source filesCristian Adam2020-07-295-1/+23
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21028
* | | | | | | | Merge topic 'FindCURL-list-index-if' into release-3.18Brad King2020-07-291-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0faedae335 FindCURL: Fix list index check after search Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5070
| * | | | | | | | FindCURL: Fix list index check after searchMike Gelfand2020-07-281-3/+3
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic added by commit fc5afbe970 (FindCURL: support COMPONENTS to check features, 2018-11-28, v3.14.0-rc1~287^2~2). When searching for particular components and `curl-config` reports one of the components being searched for first in the list, `find_package` fails. This is due to the check that treats non-zero index in the list as success and zero index as failure, while documentation on `list(FIND)` states that failure to find an element results in return value of -1 (not 0). I'm hitting this when building cURL with support for HTTP and HTTPS protocols only, and then trying to `find_package(CURL COMPONENTS HTTP HTTPS)`. I'm using `if(NOT x EQUAL -1)` check form as it appears to be the most used throughout the modules. While fixing this issue I've looked through all the uses of `list(FIND)` in other modules but wasn't able to find improper use except here.
* | | | | | | | Merge topic 'revert-add_test-special-chars' into release-3.18Brad King2020-07-2859-383/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5fc5f4d26e add_test: Revert "Allow special characters in test name" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5067
| * | | | | | | | add_test: Revert "Allow special characters in test name"Brad King2020-07-2759-383/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit f84af8e270 (add_test: Allow special characters in test name, 2020-05-16, v3.18.0-rc1~142^2). Unfortunately the fix breaks projects that were working around the limitation with manual escaping. The fix can be re-introduced with a policy in a future version. Also add a 3.18.1 release note explaining the change. Fixes: #21017, #20965 Issue: #19391
* | | | | | | | | Merge topic 'sysroot-prefix' into release-3.18Brad King2020-07-281-1/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e67d9c6e31 Compilers: Ignore -print-sysroot prefix when it is '/' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5066
| * | | | | | | | | Compilers: Ignore -print-sysroot prefix when it is '/'Brad King2020-07-271-1/+3
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 8cc384f629 (Compilers: Add paths from -print-sysroot to system prefix path, 2020-03-25, v3.18.0-rc1~337^2) we prepend the compiler's sysroot to `CMAKE_SYSTEM_PREFIX_PATH`. This does not make sense when the prefix is just `/`, such as on Ubuntu 16.04's system compiler. Fixes: #21019
* | | | | | | | | Merge topic 'fix-dependent-pipelines' into release-3.18Brad King2020-07-271-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 726766713b gitlab-ci: avoid failing dependent steps Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5069
| * | | | | | | | | gitlab-ci: avoid failing dependent stepsBen Boeckel2020-07-271-2/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids making busted jobs if a prerequisite fails.
* | | | | | | | | Merge topic 'bootstrap-intel' into release-3.18Brad King2020-07-271-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 796466284b bootstrap: Fix support for Intel compiler with modern GNU system compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5057
| * | | | | | | | bootstrap: Fix support for Intel compiler with modern GNU system compilerBrad King2020-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On systems with older GNU system compilers, the Intel C++ compiler does not define `__cplusplus` to any version newer than C++11. This prevented `bootstrap` from detecting that a given C++ standard flag has enabled C++17 mode in the compiler. In commit 033a4b12a5 (bootstrap: Extend C++17 check for our cast functions, 2019-12-14, v3.17.0-rc1~291^2) we added a preprocessor condition to attempt to detect C++17 mode in the Intel compiler on such systems by looking for `__cpp_if_constexpr`. However, on systems with a modern GNU system compiler, that definition is available even in C++11 mode. Switch to using `__cpp_deduction_guides` to detect C++17 mode for the Intel C++ compiler. That seems to be defined exclusively in C++17 mode regardless of the version of the system compiler. Fixes: #21013
* | | | | | | | | Merge topic 'externalproject-download-git-2.20-fix' into release-3.18Brad King2020-07-271-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8dbefc3ca6 ExternalProject: omit --no-checkout from git clone when using git 2.20.x. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5054
| * | | | | | | | | ExternalProject: omit --no-checkout from git clone when using git 2.20.x.Nate Avers2020-07-241-1/+5
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The optimization from commit 627fc5b44f (ExternalProject: Avoid unnecessary checkout on clone, 2019-07-29, v3.16.0-rc1~325^2) triggers a bug in the Git 2.20.x series that is not in older or newer versions. Drop the optimization for that specific range of Git versions. Fixes: #21009
* | | | | | | | | Merge topic 'xcode-12-legacy-deprecation' into release-3.18Brad King2020-07-271-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36fc3a1e84 Xcode: Suppress legacy build system deprecation warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5052
| * | | | | | | | | Xcode: Suppress legacy build system deprecation warningBrad King2020-07-231-0/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 12 beta 3 now warns about using the legacy build system. Since generation of the build system is CMake's responsibility, the warning is not relevant to our users. Suppress it. Issue: #18088
* | | | | | | | | Merge topic 'FindXalanC-1.12' into release-3.18Brad King2020-07-271-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4bf102418b FindXalanC: Fix version parsing for XalanC 1.12 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5056
| * | | | | | | | | FindXalanC: Fix version parsing for XalanC 1.12Brad King2020-07-241-3/+3
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The version header now puts parentheses around the components. Fixes: #21010
* | | | | | | | | Merge topic 'vs-lang-flags' into release-3.18Brad King2020-07-274-0/+29
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c4109a1bc8 VS: Restore toleration of target-wide -TP flag with MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5051
| * | | | | | | | VS: Restore toleration of target-wide -TP flag with MSVCBrad King2020-07-234-0/+29
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 3b547e2e4b (VS: Simplify logic adding source file C/C++ language flag to MSVC, 2020-05-15, v3.18.0-rc1~139^2~1) we only add a per-source language selection flag when the source file extension does not match the compiler's default. This approach breaks when a project adds a target-wide `-TP` flag. Although such projects likely did not work with non-VS generators, we did support them before in Visual Studio generators. Add a special case to tolerate such flags again. Fixes: #21005
* | | | | | | | Merge topic 'file-GET_RUNTIME_DEPENDENCIES-terms' into release-3.18Brad King2020-07-231-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2b60088d14 Help: Update file(GET_RUNTIME_DEPENDENCIES) prose to match option names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5053
| * | | | | | | | Help: Update file(GET_RUNTIME_DEPENDENCIES) prose to match option namesBrad King2020-07-231-2/+2
| |/ / / / / / /
* | | | | | | | Merge topic 'cmake-gui-qt-5.14' into release-3.18Brad King2020-07-231-2/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af6cf586f6 cmake-gui: Fix crash when built with Qt 5.14 or later Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5045
| * | | | | | | | cmake-gui: Fix crash when built with Qt 5.14 or laterBrad King2020-07-221-2/+3
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit d7679f6427 (QCMakeCacheView: use non-deprecated List and Set constructions, 2020-06-10, v3.18.0-rc2~13^2) the conversion of the `this->properties()` value to QSet is incorrect for Qt 5.14+. The problem is that `this->properties()` returns by value, so the range `this->properties().begin(), this->properties().end()` provides iterators to two different instances. Use an intermediate temporary copy of the value to get a consistent iterator range. Fixes: #20981
* | | | | | | | Merge topic 'aux-install-dest' into release-3.18Brad King2020-07-222-8/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 83bc79e232 Auxiliary: Add options to control Vim and Emacs file installation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5035
| * | | | | | | | Auxiliary: Add options to control Vim and Emacs file installationBrad King2020-07-212-8/+25
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 2642f432ef (Aux: Install editor and bash files to more natural locations, 2020-03-30, v3.18.0-rc1~429^2) these files are installed by default into locations that are not CMake-specific but may be distro-specific. Add options for packagers to control these locations. Also rename the `CMAKE_BASH_COMP_DIR` option to follow our conventions. Fixes: #20993
* | | | | | | | Merge topic 'graphviz-restore-per-target' into release-3.18Brad King2020-07-225-7/+201
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1829220310 Merge branch 'backport-3.17-graphviz-restore-per-target' f3a6b4a209 Tests: Cover Graphviz support for per-target dependency graph options 93549b9224 Graphviz: Restore support for per-target dependency graph options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5039
generated by cgit v0.12 at 2025-01-01 13:27:04 (GMT)