summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindMPI: Fix regression in pthread guardAxel Huebl2020-08-201-1/+1
| | | | | | | | | Fix a regression with MPI and CUDA<10.2 that did let `-pthread` flags slip to nvcc again. In commit b725a19072 (FindMPI: Deny -fexceptions from NVCC, 2020-07-02, v3.18.0-rc4~12^2) we accidentally forgot to use the variable containing the replacement result. Fixes: #21108
* Merge topic 'CMakeFindBinUtils-fallback' into release-3.18Brad King2020-08-191-0/+13
|\ | | | | | | | | | | | | 6896e50967 CMakeFindBinUtils: Always consider plain binutils when not cross-compiling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5137
| * CMakeFindBinUtils: Always consider plain binutils when not cross-compilingRobert Maynard2020-08-181-0/+13
|/ | | | | | | | | Since commit c5dd2ca538 (DetermineCompiler: Relax _CMAKE_TOOLCHAIN_PREFIX detection, 2020-03-25, v3.18.0-rc1~430^2), `_CMAKE_TOOLCHAIN_PREFIX` may be set even when not cross-compiling. In this case we may still need to use binutils without any prefix. Fixes: #21103
* Merge topic 'FindRuby_document_deprecated_variables' into release-3.18Brad King2020-08-121-2/+13
|\ | | | | | | | | | | | | e7fe0b24c4 FindRuby: Add documentation for deprecated variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5120
| * FindRuby: Add documentation for deprecated variablesDaniele E. Domenichelli2020-08-121-2/+13
|/ | | | | | | | | Since commit e672db628b (FindRuby: Rename variables to match case of module name, 2020-03-11, v3.18.0-rc1~546^2), the upper-case-prefixed variable names are for compatibility only but still exist. Put them back in the documentation. Issue: #21064
* Merge topic 'msvc_c11' into release-3.18Brad King2020-08-123-12/+40
|\ | | | | | | | | | | | | f7347f28c7 MSVC: Record support for C11 and c_restrict Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5115
| * MSVC: Record support for C11 and c_restrictRaul Tambre2020-08-113-12/+40
| | | | | | | | | | | | | | MSVC >=19.27 supports a C11 switch. The `c_restrict` feature has also been implemented. Fixes: #21069
* | Merge topic 'FindPython-manage-SOABI-in-all-versions' into release-3.18Brad King2020-08-122-12/+20
|\ \ | | | | | | | | | | | | | | | | | | 951640f1f9 FindPython: manage SOABI for all Python versions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5119
| * | FindPython: manage SOABI for all Python versionsMarc Chevrier2020-08-112-12/+20
| | | | | | | | | | | | Fixes: #21070
* | | Merge topic 'gitlab-ci-tag-cmake' into release-3.18Brad King2020-08-111-0/+3
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 778ea72b59 gitlab-ci: add 'cmake' tag to all jobs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5121
| * | gitlab-ci: add 'cmake' tag to all jobsBrad King2020-08-111-0/+3
| | | | | | | | | | | | | | | This will give us more granular control over which runners accept jobs for CMake.
* | | Merge topic 'findhdf5-fix-nohl' into release-3.18Brad King2020-08-111-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e038107ee7 FindHDF5: fix compiler detection when HL is disabled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5112
| * | | FindHDF5: fix compiler detection when HL is disabledSeth R Johnson2020-08-101-1/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A valid HDF5 installation with the "high level" extensions not configured will *fail* to be correctly detected by CMake since commit d9e39f3f89 (FindHDF5: check that compiler wrapper can compile a minimal program, 2020-02-10, v3.18.0-rc1~744^2~1): ``` /.../hdf5/cmake_hdf5_test.c:2:10: fatal error: 'hdf5_hl.h' file not found ``` This does not stop the configuration but does prevent flags and libraries from being recognized.
* | | Merge topic 'osx-archs-apple-only' into release-3.18Brad King2020-08-111-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 70ce1ad64a PCH: Avoid Apple-specific architecture flags on other platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5118
| * | | PCH: Avoid Apple-specific architecture flags on other platformsBrad King2020-08-101-0/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit f593b354da (PCH: Add support for multi architecture iOS projects, 2020-04-02, v3.18.0-rc1~414^2) the `OSX_ARCHITECTURES` target property (and corresponding `CMAKE_OSX_ARCHITECTURES` variable) affects flags on non-Apple platforms by accident. Add a missing condition to avoid this. Fixes: #21072
* | | Merge topic 'automoc-path-prefix-off' into release-3.18Brad King2020-08-115-5/+15
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b5be34811 Help: Add 3.18.2 release note about AUTOMOC_PATH_PREFIX default change db659e18bc Merge branch 'backport-3.17-automoc-path-prefix-off' e503fbe38a Merge branch 'backport-3.16-automoc-path-prefix-off' 4c33b305a0 Autogen: Turn off moc path prefix generation by default 56510b7d85 Merge branch 'backport-test-FindPkgConfig-isolate-env' into release-3.17 effc9a1032 Merge branch 'backport-3.17-automoc_timestamp_deps' into release-3.17 507fecd7e2 Merge branch 'ninja-multi-rsp-remove-path' into release-3.17 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5105
| * | Help: Add 3.18.2 release note about AUTOMOC_PATH_PREFIX default changeJoerg Bornemann2020-08-101-0/+8
| | |
| * | Merge branch 'backport-3.17-automoc-path-prefix-off'Brad King2020-08-104-5/+7
| |\ \
| | * \ Merge branch 'backport-3.16-automoc-path-prefix-off'Brad King2020-08-104-5/+7
| | |\ \
| | | * | Autogen: Turn off moc path prefix generation by defaultJoerg Bornemann2020-08-104-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default value of `CMAKE_AUTOMOC_PATH_PREFIX` to `OFF` to restore compatibility with behavior of CMake 3.15 and below. C++ source files that are generated by Qt's meta object compiler (moc) include the header file that was passed as input argument to moc. This is usually a path relative to the source directory, for example #include "../../source/dir/myobject.h" That is problematic for reproducible builds as described in #18815. To cope with that, the target property AUTOMOC_PATH_PREFIX was introduced in CMake 3.16 by commit d018d27c10 (Autogen: Add moc path prefix generation (AUTOMOC_PATH_PREFIX), 2019-09-13, v3.16.0-rc1~94^2~4). The property is default-initialized from the variable `CMAKE_AUTOMOC_PATH_PREFIX`, which defaults to `ON`. If this property is ON, and myobject.h is located in an include directory of the target, moc-generated C++ files include the file without the "path prefix": #include "myobject.h" This behavior, however, can break projects that have equally named header files in different include directories. As "not breaking existing projects" trumps "have reproducible builds by default" we change the default of `CMAKE_AUTOMOC_PATH_PREFIX` to `OFF`. Also, it is now possible to pass `-DCMAKE_AUTOMOC_PATH_PREFIX=ON` on the CMake command line. Before, it was overridden in `CMakeGenericSystem`. Fixes: #20598 Issue: #18815
| | * | | Merge branch 'backport-test-FindPkgConfig-isolate-env' into release-3.17Brad King2020-08-071-0/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !5108
| | * \ \ \ Merge branch 'backport-3.17-automoc_timestamp_deps' into release-3.17Brad King2020-08-058-3/+104
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !5085
| | * \ \ \ \ Merge branch 'ninja-multi-rsp-remove-path' into release-3.17Brad King2020-08-031-10/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !5094
* | | \ \ \ \ \ Merge topic 'FPHSA-name-mismatches-chained-via-include' into release-3.18Brad King2020-08-107-0/+52
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98844ec9db FPHSA: detect inclusion between find modules Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Logan Barnes <barneslt63@gmail.com> Merge-request: !5107
| * | | | | | | | FPHSA: detect inclusion between find modulesBen Boeckel2020-08-077-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Various find modules include each other to delegate finding some subset or variant of the package. Ideally, these would use `find_dependency` or some other actual `find_package` mechanism, but that is a larger change. Instead, just detect inclusion and suppress FPHSA name mismatch warnings. Fixes: #21060
* | | | | | | | | Merge topic 'xcode-try_compile-no-sign-backport' into release-3.18Brad King2020-08-101-0/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97d581b25d Xcode: Explicitly turn off signing in try_compile projects Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5117
| * | | | | | | | | Xcode: Explicitly turn off signing in try_compile projectsBrad King2020-08-101-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18407, #20571, #20688
* | | | | | | | | | Merge topic 'FindRuby-restore-include-path' into release-3.18Brad King2020-08-101-2/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6959744131 FindRuby: Restore compatibility variable RUBY_INCLUDE_PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5109
| * | | | | | | | | | FindRuby: Restore compatibility variable RUBY_INCLUDE_PATHBrad King2020-08-071-2/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit e672db628b (FindRuby: Rename variables to match case of module name, 2020-03-11, v3.18.0-rc1~546^2), the result variables named with the old `RUBY_` prefix are provided by compatibility code that maps from the new `Ruby_` prefix variables. There is no `Ruby_INCLUDE_PATH` variable, so do not try to map it to `RUBY_INCLUDE_PATH`. The latter is provided by dedicated compatibility code left from before that transition. Fixes: #21064
* | | | | | | | | | Merge topic 'FindPython-user-policies' into release-3.18Brad King2020-08-102-9/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a92d384548 FindPython: ensure user's policies are respected Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Henry Schreiner <henryschreineriii@gmail.com> Merge-request: !5098
| * | | | | | | | | FindPython: ensure user's policies are respectedMarc Chevrier2020-08-072-9/+6
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not set the policy version before recording our internal macros such as `__Python_add_library`. Otherwise callers get our policy version instead of theirs. Instead just set the specific policies we need. Also fix one case in our test suite where we were accidentally relying on the policy version to be set by `FindPython`. Fixes: #21042
* | | | | | | | | 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
generated by cgit v0.12 at 2024-12-29 14:03:01 (GMT)