summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* gitlab-ci: add job testing cuda9.2 with Ninja Multi-ConfigBrad King2021-07-014-0/+32
|
* ci: add cuda9.2 base imageBrad King2021-07-012-0/+19
|
* Merge branch 'release-3.21'Brad King2021-06-300-0/+0
|\
| * Merge topic 'doc-vs-fortran' into release-3.21Brad King2021-06-307-14/+21
| |\ | | | | | | | | | | | | | | | | | | ab06f78182 Help: Document VS generator support for Intel Fortran Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6289
* | \ Merge topic 'doc-vs-fortran'Brad King2021-06-307-14/+21
|\ \ \ | | |/ | |/| | | | | | | | | | | | | ab06f78182 Help: Document VS generator support for Intel Fortran Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6289
| * | Help: Document VS generator support for Intel FortranBrad King2021-06-307-14/+21
| |/ | | | | | | | | | | | | Extend the list of project types added by commit a82eb539f0 (Help: Describe the type of Visual Studio projects that can be generated, 2018-08-04, v3.13.0-rc1~227^2) to mention that Fortran projects are supported with Intel compiler integration.
* | Merge branch 'release-3.21'Brad King2021-06-300-0/+0
|\ \ | |/
| * CMake 3.21.0-rc2v3.21.0-rc2Brad King2021-06-301-1/+1
| |
* | Merge topic 'ninja-edit_cache'Brad King2021-06-308-48/+47
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51bf4094fb Ninja: Use `ccmake` for `edit_cache` 7cb4ad7e39 cmGlobalCommonGenerator: Adopt GetEditCacheCommand 23af78bb78 cmGlobalCommonGenerator: Adopt GetEditCacheTargetName 1db4d74628 cmGlobalCommonGenerator: Add SupportsDirectConsole 61a737b088 cmGlobalNinjaGenerator: Rename SupportsConsolePool to SupportsDirectConsole Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6272
| * | Ninja: Use `ccmake` for `edit_cache`NAKAMURA Takumi2021-06-294-9/+6
| | | | | | | | | | | | | | | If `ninja` is new enough to support the console pool, and `ccmake` is available, use it for `edit_cache`.
| * | cmGlobalCommonGenerator: Adopt GetEditCacheCommandNAKAMURA Takumi2021-06-294-33/+33
| | | | | | | | | | | | | | | Move the implementation from the Makefile generator so it can be later used by the Ninja generator too.
| * | cmGlobalCommonGenerator: Adopt GetEditCacheTargetNameNAKAMURA Takumi2021-06-293-2/+1
| | | | | | | | | | | | The implementation is the same for both Makefile and Ninja generators.
| * | cmGlobalCommonGenerator: Add SupportsDirectConsoleNAKAMURA Takumi2021-06-292-1/+4
| | | | | | | | | | | | | | | Default to `true` since this is used by Makefile generators. The Ninja generator already overrides it to use a version check.
| * | cmGlobalNinjaGenerator: Rename SupportsConsolePool to SupportsDirectConsoleNAKAMURA Takumi2021-06-293-5/+5
| | | | | | | | | | | | Use a name that is not ninja-specific.
* | | Merge branch 'release-3.21'Brad King2021-06-300-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'CMP0126-WARNING' into release-3.21Brad King2021-06-308-6/+47
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 16208ac113 CMP0126: Add control for warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6282
* | \ \ Merge topic 'CMP0126-WARNING'Brad King2021-06-308-6/+47
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 616972197a Merge branch 'backport-3.21-CMP0126-WARNING' into CMP0126-WARNING 16208ac113 CMP0126: Add control for warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6282
| * \ \ \ Merge branch 'backport-3.21-CMP0126-WARNING' into CMP0126-WARNINGMarc Chevrier2021-06-298-6/+47
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | CMP0126: Add control for warningsMarc Chevrier2021-06-298-6/+47
| | | | | | | | | | | | | | | | | | | | Fixes: #22353
* | | | | Merge branch 'release-3.21'Brad King2021-06-300-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge topic 'fujitsu-clang-findbinutils' into release-3.21Brad King2021-06-302-0/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6ce97c2248 FujitsuClang: Change LTO option from -flto=thin to -flto 3a0effcd16 FujitsuClang: Set CMAKE_<LANG>_COMPILER_AR and CMAKE_<LANG>_COMPILER_RANLIB Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6281
* | \ \ \ \ Merge topic 'fujitsu-clang-findbinutils'Brad King2021-06-302-0/+9
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6ce97c2248 FujitsuClang: Change LTO option from -flto=thin to -flto 3a0effcd16 FujitsuClang: Set CMAKE_<LANG>_COMPILER_AR and CMAKE_<LANG>_COMPILER_RANLIB Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6281
| * | | | | FujitsuClang: Change LTO option from -flto=thin to -fltoYuichiro Utsumi2021-06-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since -flto=thin is not supported officially in FujitsuClang, change to -flto.
| * | | | | FujitsuClang: Set CMAKE_<LANG>_COMPILER_AR and CMAKE_<LANG>_COMPILER_RANLIBYuichiro Utsumi2021-06-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #22337
* | | | | | Merge branch 'release-3.21'Brad King2021-06-300-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'vs-ARM64EC' into release-3.21Brad King2021-06-301-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da0f74b5a1 VS: Add ARM64EC to supported platforms for VS 16 and 17 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6283
* | \ \ \ \ \ Merge topic 'vs-ARM64EC'Brad King2021-06-301-1/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da0f74b5a1 VS: Add ARM64EC to supported platforms for VS 16 and 17 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6283
| * | | | | | VS: Add ARM64EC to supported platforms for VS 16 and 17Brad King2021-06-291-1/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 4ea3a88625 (MSVC: Add support for targeting ARM64EC, 2020-12-30, v3.20.0-rc1~121^2) the `ARM64EC` platform was accidentally added to the list for VS 15 (2017) instead of VS 16 (2019). Its omission from the list of platforms was then repeated for VS 17 (2022). Issue: #21724
* | | | | | Merge branch 'release-3.21'Brad King2021-06-300-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'rpm-suggests' into release-3.21Brad King2021-06-304-13/+50
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b53eca317 CPack/RPM: Fix weak dep support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6274
* | \ \ \ \ \ Merge topic 'rpm-suggests'Brad King2021-06-304-13/+50
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b53eca317 CPack/RPM: Fix weak dep support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6274
| * | | | | | CPack/RPM: Fix weak dep supportAlex Sweet2021-06-294-13/+50
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RPM 4.11.3 for el7 contains backported support for the RPM weak dep tags. It only supports querying those tags, but rpmbuild can not make use of them. Since CPack relies on rpmbuild --querytags to check for support, this commit switches to rpm --suggests to check for support of weak dependencies. Fixes: #22350
* | | | | | Merge branch 'release-3.21'Brad King2021-06-300-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'tll-out-of-dir' into release-3.21Brad King2021-06-306-7/+30
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e27a76f131 target_link_libraries: Restore transitive out-of-dir linking Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6285
* | \ \ \ \ \ Merge topic 'tll-out-of-dir'Brad King2021-06-306-7/+30
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e27a76f131 target_link_libraries: Restore transitive out-of-dir linking Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6285
| * | | | | | target_link_libraries: Restore transitive out-of-dir linkingBrad King2021-06-296-7/+30
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 7f506b95a7 (cmGeneratorTarget: Refactor link item lookup, 2021-05-26, v3.21.0-rc1~103^2~4) accidentally dropped the persistent lookup scope tracking across multiple items that was added by commit f0e67da061 (target_link_libraries: Fix out-of-dir linking of a list of targets, 2020-01-14, v3.17.0-rc1~149^2). This broke a transitive out-of-dir linking case not covered by our test suite. Restore the scope tracking and add a test case. Fixes: #22363
* | | | | | Merge branch 'release-3.21'Brad King2021-06-300-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'compiler-id-msvc-has-include' into release-3.21Brad King2021-06-302-0/+8
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c6aaaf066a DetermineCompiler: Restore identification of MSVC with no INCLUDE dirs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6284
* | | | | | Merge topic 'compiler-id-msvc-has-include'Brad King2021-06-302-0/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c6aaaf066a DetermineCompiler: Restore identification of MSVC with no INCLUDE dirs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6284
| * | | | | DetermineCompiler: Restore identification of MSVC with no INCLUDE dirsBrad King2021-06-292-0/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit bd844387df (ROCMClang: Add the ROCm toolkit derived clang compiler to CMake, 2020-08-28, v3.21.0-rc1~66^2~6), our generated compiler id source file contains a preprocessor condition of the form #elif ... && __has_include(...) When MSVC is invoked with no include directories in the `INCLUDE` environment variable or in `-I` flags, its implementation of `__has_include` errors out immediately. This breaks identification of the compiler. Work around the problem by adding a fallback attempt to compile the identification source using a dummy include directory.
* | | | | CMake Nightly Date StampKitware Robot2021-06-301-1/+1
| | | | |
* | | | | Merge topic 'test-CTestTestSerialInDepends-lockfile'Brad King2021-06-291-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5011a2fbf Tests: Cleanup CTestTestSerialInDepends lockfile at test start Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6273
| * | | | | Tests: Cleanup CTestTestSerialInDepends lockfile at test startAlex Sweet2021-06-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When any test under CTestTestSerialInDepends starts, delete the lockfile for that test in case it wasn't deleted at the end of the last test run. Fixes: #22351
* | | | | | Merge branch 'release-3.21'Brad King2021-06-290-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'update-kwsys' into release-3.21Brad King2021-06-293-4/+23
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e9a32947b Merge branch 'upstream-KWSys' into update-kwsys bf4ae1c2b2 KWSys 2021-06-28 (0648cb1a) Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Björn Esser <besser82@fedoraproject.org> Merge-request: !6266
* | \ \ \ \ \ Merge topic 'update-kwsys'Brad King2021-06-293-4/+23
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e9a32947b Merge branch 'upstream-KWSys' into update-kwsys bf4ae1c2b2 KWSys 2021-06-28 (0648cb1a) Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Björn Esser <besser82@fedoraproject.org> Merge-request: !6266
| * | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2021-06-283-4/+23
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2021-06-28 (0648cb1a)
| | * | | | | | KWSys 2021-06-28 (0648cb1a)KWSys Upstream2021-06-283-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 0648cb1ac5c91430b190f32319c528345b280dc3 (master). Upstream Shortlog ----------------- Ben Boeckel (2): df91e5f1 EncodingC: use NULL for pointers ab959cd2 SystemInformation: fix typo in comment Björn Esser (2): b4a2a03c testDynamicLoader: Use LIBDL_SO macro if defined. b954dd54 testDynamicLoader: Use LIBC_SO if LIBDL_SO is not defined by glibc anymore.
* | | | | | | | Merge branch 'release-3.21'Brad King2021-06-290-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge topic 'tests-tolerate-NINJA_STATUS' into release-3.21Brad King2021-06-292-0/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63177678d0 Tests/RunCMake/Ninja.*: Sanitize NINJA_STATUS since we expect default behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6271
generated by cgit v0.12 at 2025-02-22 01:21:45 (GMT)