summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cmake-gui-qt6'Brad King2021-01-075-28/+137
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 2e4cbaa521 cmake-gui: Add a Qt version control variable b3ee09290b cmake-gui: Conditionally switch between QDirModel and QFileSystemModel 020b2766f3 cmake-gui: Replace obsolete QDirModel with QFileSystemModel 684dcdbc5b cmake-gui: Prefer local variable for Qt major version 50fcc94bc5 cmake-gui: Support installation for both Qt5 and Qt6 plugins 2a2942a42e cmake-gui: Use a consistent Qt major version variable name 035078d847 cmake-gui: Remove explicit locale setup f1de6f6682 cmake-gui: Support building against Qt6 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5621
| * cmake-gui: Add a Qt version control variableSankhesh Jhaveri2021-01-051-8/+20
| |
| * cmake-gui: Conditionally switch between QDirModel and QFileSystemModelSankhesh Jhaveri2021-01-051-1/+36
| | | | | | | | | | Uses QT_VERSION_CHECK to determine Qt version. The code switches to QFileSystemModel for Qt versions >= 6
| * cmake-gui: Replace obsolete QDirModel with QFileSystemModelSankhesh Jhaveri2021-01-051-13/+10
| |
| * cmake-gui: Prefer local variable for Qt major versionSankhesh Jhaveri2021-01-051-23/+27
| | | | | | | | QT_DEFAULT_MAJOR_VERSION was added in Qt 5.15 and CMake supports Qt versions >= 5.9
| * cmake-gui: Support installation for both Qt5 and Qt6 pluginsSankhesh Jhaveri2021-01-051-7/+17
| |
| * cmake-gui: Use a consistent Qt major version variable nameSankhesh Jhaveri2021-01-051-20/+19
| |
| * cmake-gui: Remove explicit locale setupSankhesh Jhaveri2021-01-051-4/+0
| | | | | | | | Qt uses utf-8 encoding by default for versions >= Qt5.
| * cmake-gui: Support building against Qt6Sankhesh Jhaveri2021-01-053-21/+77
| |
* | Merge topic 'export-target-name-subst'Brad King2021-01-071-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 06f921d9f6 export: Fix replacement of multiple TARGET_NAME expressions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5666
| * | export: Fix replacement of multiple TARGET_NAME expressionsBrad King2021-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | After replacing each such expression, search for following expressions immediately after the end of the replacement text, not after the position of the end of the replaced text. Fixes: #21661
* | | Merge topic 'ctest-progress-output-fixes'Brad King2021-01-072-4/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39cdc8afb9 ctest: Make verbose mode override progress behavior 1bcd9b06b9 ctest: Don't treat skipped test as failed tests in progess report Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5663
| * | | ctest: Make verbose mode override progress behaviorSylvain Joubert2021-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | Start and results should now be back in verbose mode even with progress mode enabled.
| * | | ctest: Don't treat skipped test as failed tests in progess reportSylvain Joubert2021-01-051-3/+4
| |/ / | | | | | | | | | | | | Skipped tests should not stand out on their own lines Fixes #21143
* | | CMake Nightly Date StampKitware Robot2021-01-071-1/+1
| | |
* | | Merge branch 'release-3.19'Brad King2021-01-060-0/+0
|\ \ \
| * \ \ Merge topic 'FindHDF5-dbg-and-rel' into release-3.19Brad King2021-01-061-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5267ba9d63 FindHDF5: Fix finding both debug and release libs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5653
* | \ \ \ Merge topic 'FindHDF5-dbg-and-rel'Brad King2021-01-061-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 5267ba9d63 FindHDF5: Fix finding both debug and release libs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5653
| * | | | FindHDF5: Fix finding both debug and release libsKris Thielemans2021-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `target_link_libraries` to set `INTERFACE_LINK_LIBRARIES` so that the `debug` and `optimized` keywords work. In commit a8e0a6b3e4 (FindHDF5: Port changes from VTK, 2020-06-10, v3.19.0-rc1~312^2~1) we added use of `HDF5_LIBRARIES`, but the value may contain `debug` and `optimized` keywords. Fixes: #21637
* | | | | Merge branch 'release-3.19'Brad King2021-01-060-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'ci-xcode-12.3' into release-3.19Brad King2021-01-061-4/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b4a50d622 gitlab-ci: update macOS jobs to use Xcode 12.3 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5670
* | \ \ \ \ Merge topic 'ci-xcode-12.3'Brad King2021-01-061-4/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b4a50d622 gitlab-ci: update macOS jobs to use Xcode 12.3 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5670
| * | | | | gitlab-ci: update macOS jobs to use Xcode 12.3Brad King2021-01-061-4/+4
| |/ / / /
* | | | | Merge topic 'explicit-this-fix'Brad King2021-01-06127-4575/+5221
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 209daa20b2 Code style: add missed explicit 'this->' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5400
| * | | | | Code style: add missed explicit 'this->'Oleksandr Koval2021-01-05127-4575/+5221
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | CMake uses explicit 'this->' style. Using custom clang-tidy check we can detect and fix places where 'this->' was missed.
* | | | | Merge topic 'depend_make_refine'Brad King2021-01-0611-24/+125
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b696f78073 cmDepends: merge dependers of depend makefile Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5631
| * | | | | cmDepends: merge dependers of depend makefileKai Wang2021-01-0511-24/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since one depender has multiple dependees, depend makefile generated same depender line by line, to reduce file size and refine make file parse speed, merge same dependers to one. And add a testcase for large depend.make which generated source file includes 20000 header files and run build and incremental build Signed-off-by: Wangkai <wangkai86@huawei.com> Signed-off-by: Zhaoyingdong <zhaoyingdong@huawei.com>
* | | | | | Merge topic 'update-kwsys'Brad King2021-01-061-5/+63
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b6ae9ddc41 Merge branch 'upstream-KWSys' into update-kwsys 3887390a37 KWSys 2021-01-05 (a72d59e1) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5665
| * \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2021-01-051-5/+63
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2021-01-05 (a72d59e1)
| | * | | | | KWSys 2021-01-05 (a72d59e1)KWSys Upstream2021-01-051-5/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit a72d59e12fcfcce1a88456effb6543bf3cd20dc9 (master). Upstream Shortlog ----------------- Dylan Fan (1): e6cc4679 SystemInformation: Add Zhaoxin x86 processor
* | | | | | | CMake Nightly Date StampKitware Robot2021-01-061-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.19'Brad King2021-01-050-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge topic 'FindMPI-oneapi-single-quotes' into release-3.19Brad King2021-01-051-0/+1
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5b223aa7f FindMPI: remove single quotes from include path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5654
* | | | | | | Merge topic 'FindMPI-oneapi-single-quotes'Brad King2021-01-051-0/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5b223aa7f FindMPI: remove single quotes from include path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5654
| * | | | | | FindMPI: remove single quotes from include pathEduard Valeyev2021-01-041-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Intel OneAPI's MPI wraps include paths into single quotes, remove them when sanitizing _MPI_INCLUDE_PATH Fixes: #21634
* | | | | | Merge topic 'java-export-native_headers'Brad King2021-01-055-5/+87
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53235626a2 UseJava: enable exportation of native headers target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5658
| * | | | | | UseJava: enable exportation of native headers targetMarc Chevrier2020-12-295-5/+87
| | | | | | |
* | | | | | | Merge topic 'ninja-omit-empty-custom-command'Brad King2021-01-053-1/+13
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d43f4692e0 Ninja: Omit custom commands with an empty COMMAND Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5647
| * | | | | | Ninja: Omit custom commands with an empty COMMANDShannon Booth2020-12-233-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21063
* | | | | | | CMake Nightly Date StampKitware Robot2021-01-051-1/+1
| | | | | | |
* | | | | | | Merge topic 'posix-test-command'Brad King2021-01-041-5/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d9a788b356 bootstrap: test -a|o is not POSIX Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5650
| * | | | | | | bootstrap: test -a|o is not POSIXIssam E. Maghni2020-12-231-5/+4
| | | | | | | |
* | | | | | | | Merge topic 'clang_win32_subsystem'Brad King2021-01-042-0/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acfb54bb2f Clang: Support WIN32_EXECUTABLE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5648
| * | | | | | | | Clang: Support WIN32_EXECUTABLERaul Tambre2020-12-232-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #21613.
* | | | | | | | | Merge topic 'tests-bump-minver'Brad King2021-01-0477-77/+80
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72e7c45e98 Tests: Bump CMake minimum required in tests to 2.8.12 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5644
| * | | | | | | | | Tests: Bump CMake minimum required in tests to 2.8.12Chuck Atkins2020-12-2377-77/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 3.19, CMake generates a deprecation warning when using a minimum version less than 2.8.12. This eliminates those warnings generated during tests, which are typically hidden from the user and developer but are being generated nonetheless.
* | | | | | | | | | Merge topic 'emacs-mode-not-char'Brad King2021-01-041-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3987db59c5 cmake-mode.el: Fix rx usage for Emacs 26 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Przemyslaw Kryger <pkryger@gmail.com> Acked-by: Jostein Kjønigsen <jostein@kjonigsen.net> Merge-request: !5657
| * | | | | | | | | | cmake-mode.el: Fix rx usage for Emacs 26marciosmiderle2021-01-041-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit 901386f646 (cmake-mode.el: Add navigation by function and macro, 2020-12-11) introduced a regression. Emacs 26 could not load cmake-mode.el anymore. Use `(not-char ")")`, not `(not ")")`.
* | | | | | | | | | Merge topic 'tutorial-typo'Brad King2021-01-041-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b42a63605c Tutorial: Fix minor typo in index.rst Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5662
| * | | | | | | | | | Tutorial: Fix minor typo in index.rstfazl2021-01-041-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | s/mqsqrt.h/mysqrt.h/
generated by cgit v0.12 at 2025-02-13 12:26:41 (GMT)