mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-12 17:19:05 -05:00
Code Issues Packages Projects Releases Wiki Activity
54,735 Commits 2 Branches 401 Tags
6fbd94cf5bc595fa143947ffa7531d9b9b5ce8ea
Commit Graph

54735 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 6fbd94cf5b Merge topic 'tutorial_update_step_11' 
6dade88d1c Tutorial: Add documentation on Package helper functions
1bf25b5b5f Tutorial: Remove information about EXPORT keyword

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6575
 2021-10-05 09:04:37 -04:00
Brad King 77f3cdf15b Merge branch 'release-3.21' 2021-10-05 09:02:00 -04:00
Brad King 95eaadb852 Merge topic 'testdriver-old-cast-warning' 
ba54092842 TestDriver: Fix old-style-cast warning in C++ mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6590
 2021-10-05 09:02:00 -04:00
Brad King 7518fc0c31 Merge topic 'testdriver-old-cast-warning' into release-3.21 
ba54092842 TestDriver: Fix old-style-cast warning in C++ mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6590
 2021-10-05 09:01:59 -04:00
Craig Scott a31447417f Merge topic 'qt6-tests' 
a742088472 Tests: Add support for testing Qt6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6587
 2021-10-05 08:27:02 -04:00
Kitware Robot 1b21eb8212 CMake Nightly Date Stamp 2021-10-05 00:01:15 -04:00
Brad King c55a41c9b2 Merge topic 'default_extensions' 
4a0485be7f cmStandardLevelResolver: Avoid unnecessary flags, fix unset level logic
29e2b85171 Tests: Simplify RunCMake.CompileFeatures introspection
fc3a1cbdd8 CompilerID: Compiler extensions default detection
2adfd95d79 CompilerID: Rename language_dialect to language_standard
00055d7779 Help: Document CMAKE_<LANG>_STANDARD_DEFAULT
a65bee4cfc Help: Document HIP standard/extensions properties and variables
a40ff1bb5a Help: Make language standard/extensions variable pages less wordy
3feff8379b Help: Generic language standard and extension variables documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6177
 2021-10-04 12:43:24 -04:00
Sylvain Joubert ba54092842 TestDriver: Fix old-style-cast warning in C++ mode 
A C-style cast was added by commit 3f6ff4b5db (create_test_sourcelist:
add test driver option to run all tests, 2021-04-27, v3.21.0-rc1~257^2).
Use our `CM_CAST` macro to adapt based on the language.
 2021-10-04 11:00:12 -04:00
Brad King b2726f13bd Merge topic 'e2k_support' 
d6746fd05c cmMakefile: Fix compilation on EDG-based compilers such as LCC
77c237d219 zstd: Fix incorrect pragma error on LCC compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Igor S. Gerasimov <i.s.ger@yandex.ru>
Merge-request: !6579
 2021-10-04 10:41:38 -04:00
Brad King 6cba074516 Merge branch 'release-3.21' 2021-10-04 10:36:53 -04:00
Brad King b6b4e46a81 Merge topic 'FortranCInterface-timestamp-check' 
2a00e5072d FortranCInterface: Fix regression in timestamp check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !6581
 2021-10-04 10:36:52 -04:00
Brad King d1a7e78c4f Merge topic 'FortranCInterface-timestamp-check' into release-3.21 
2a00e5072d FortranCInterface: Fix regression in timestamp check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !6581
 2021-10-04 10:36:51 -04:00
Brad King 1bb54fa6a7 Merge topic 'cuda-6.5' 
a1f0ddcbb7 CUDA: Fix detection of implicit link information with CUDA 6.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6574
 2021-10-04 10:34:40 -04:00
Brad King f3a6d295e8 Merge topic 'tutorial-regex' 
0f17b37b96 Tutorial: Fix regexps in sample CMakeLists.txt files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6572
 2021-10-04 10:31:57 -04:00
Brad King 162413664f Merge topic 'tutorial-step1' 
14600a42c8 Tutorial: Update Step 1 instructions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6576
 2021-10-04 10:29:00 -04:00
Brad King eb3fd11a23 Merge topic 'tutorial-step5' 
01c332c9c7 Tutorial: Clarify instructions in Step 5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6577
 2021-10-04 10:26:45 -04:00
Brad King 815dd8a920 Merge topic 'ci-cuda9.2' 
5329366527 ci: update cuda9.2 base image after DST Root CA X3 expiry

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6583
 2021-10-04 10:24:29 -04:00
Craig Scott a742088472 Tests: Add support for testing Qt6 
The minimum CMake version for Qt6 is 3.16, so all the calls to
cmake_minimum_required() are updated here to enforce that
minimum. This will avoid any CMake version-related warnings
from Qt.

Avoid hard-coding Qt5 where the tests could now be using
Qt5 or Qt6.

Fixes: #22188
 2021-10-04 22:10:57 +11:00
Kitware Robot 8dee2c3aee CMake Nightly Date Stamp 2021-10-04 00:01:32 -04:00
Craig Scott 63d7404a8a Merge topic 'compile-feature-version-tags' 
b75f778531 Help: Detailed version tags for compiler known features

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6562
 2021-10-03 01:27:38 -04:00
Kitware Robot fae0b9fb71 CMake Nightly Date Stamp 2021-10-03 00:01:10 -04:00
Kitware Robot be604bec8d CMake Nightly Date Stamp 2021-10-02 00:01:09 -04:00
FeRD (Frank Dana) b75f778531 Help: Detailed version tags for compiler known features 2021-10-02 09:13:53 +10:00
makise-homura d6746fd05c cmMakefile: Fix compilation on EDG-based compilers such as LCC 
Compilers based on EDG frontend sometimes throw
an internal error while using `this->` at some
circumstances. While it is up to be fixed in future
versions of front end, this bug still occurs in
some modern compilers, such as LCC for Elbrus CPUs,
and probably others (maybe ICC). It caused CMake to be
unbuildable by these compilers. This patch fixes it.
 2021-10-01 13:05:53 -04:00
Seth R Johnson 2a00e5072d FortranCInterface: Fix regression in timestamp check 
Since commit d7c8030541 (FortranCInterface: Fix misuse of IS_NEWER_THAN
in timestamp check, 2021-02-21, v3.21.0-rc1~631^2~3), FortranCInterface
checks for `Output.cmake.in` in the build tree instead of the source
tree as before.  This caused it to always re-run the detection.

Fixes: #22709
 2021-10-01 13:00:18 -04:00
Brad King 5329366527 ci: update cuda9.2 base image after DST Root CA X3 expiry 2021-10-01 10:21:39 -04:00
Kitware Robot b3a0bddc4e CMake Nightly Date Stamp 2021-10-01 00:01:25 -04:00
makise-homura 77c237d219 zstd: Fix incorrect pragma error on LCC compiler 
LCC (Elbrus C Compiler) doesn't understand some of
GCC pragmas, despite of declaring itself GCC-aware.
The pragma of subject is the one that forbids vectorizing.
Actually, LCC don't vectorize anything unless explicitly
said to, so this pragma may be safely omitted and thus
not cause an error. This patch does this.
 2021-09-30 23:19:44 +03:00
Joseph Snyder 6dade88d1c Tutorial: Add documentation on Package helper functions 
Add documentation for the configure_package_config_file() and
write_basic_package_version_file() commands.

Update the comment for the installation of those files to allow a
stopping point for the code display.

Issue: #22663
 2021-09-30 14:43:28 -04:00
Joseph Snyder 1bf25b5b5f Tutorial: Remove information about EXPORT keyword 
Remove the text that implies that the EXPORT keyword will also install
the generated CMake file.
 2021-09-30 13:06:20 -04:00
Betsy McPhail 01c332c9c7 Tutorial: Clarify instructions in Step 5 2021-09-30 12:18:41 -04:00
Betsy McPhail 14600a42c8 Tutorial: Update Step 1 instructions 
To demonstrate how simple a CMake project can be, move the `Build and Run`
section earlier in the step.
 2021-09-30 12:04:52 -04:00
samuel100u a1f0ddcbb7 CUDA: Fix detection of implicit link information with CUDA 6.5 
Fixes: #22701
 2021-09-30 09:33:17 -04:00
Christophe Bernard 0f17b37b96 Tutorial: Fix regexps in sample CMakeLists.txt files 
Replace original regexp `[-nan|nan|0]` with `(-nan|nan|0)`
which is what the author most likely intended to write in the
first place.
 2021-09-30 08:55:41 -04:00
Brad King 89d134c61d Merge topic 'FindMatlab-version-selection' 
7fdd5128b1 FindMatlab: Fix version selection if a version is given

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6300
 2021-09-30 08:52:23 -04:00
Brad King 6051e4b7c3 Merge topic 'cmake_find_library_suffixes_ext_windows_fixes' 
9aba0ce29d Help: Fix CMAKE_FIND_LIBRARY_SUFFIXES examples for Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6569
 2021-09-30 08:51:27 -04:00
Brad King ddc8ebcee3 Merge topic 'libuv-openbsd' 
096450f808 libuv: Include BSD sys/cpuset.h only on platforms where we use it

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6570
 2021-09-30 08:50:33 -04:00
Kitware Robot 32818510c8 CMake Nightly Date Stamp 2021-09-30 00:01:14 -04:00
Raul Tambre 4a0485be7f cmStandardLevelResolver: Avoid unnecessary flags, fix unset level logic 
The changes are part of CMP0128.

When the standard level is unset:
* Flags are added if extension mode doesn't match the compiler's default.
  Previously logic only worked if LANG_EXTENSIONS was ON. Fixes #22224.
* The full flag is used. Previously CMAKE_LANG_EXTENSION_COMPILE_OPTION was
  used. This was only supported for IAR.

Otherwise:
* Avoid adding flags if not necessary per the detected compiler defaults.
* Fixed check for when the requested standard is older. It now matches the
  nearby comments.

I reworded the fallback comment as its logic was a bit difficult to wrap my
head around.
 2021-09-29 22:28:40 +03:00
Brad King d332f4f825 Merge topic 'update-third-party' 
ae53a3071b update-third-party: update from upstream

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6571
 2021-09-29 15:15:19 -04:00
Brad King ae53a3071b update-third-party: update from upstream 
Update to `update-common.sh` from commit `7134d5ebef` in

    https://gitlab.kitware.com/utils/git-import-third-party
 2021-09-29 15:08:24 -04:00
Alexander Neumann 7fdd5128b1 FindMatlab: Fix version selection if a version is given 
Fixes: #22377
 2021-09-29 14:33:36 -04:00
Ralf Habacker 9aba0ce29d Help: Fix CMAKE_FIND_LIBRARY_SUFFIXES examples for Windows 
Fixes: #22697
 2021-09-29 13:38:41 -04:00
Brad King 096450f808 libuv: Include BSD sys/cpuset.h only on platforms where we use it 
Since commit 43d6e5a71f (libuv: misc: add function to get CPU affinity
mask size, 2017-09-06, v3.12.0-rc1~412^2~3) we include `<sys/cpuset.h>`
on several BSD platforms but only use it on FreeBSD.
 2021-09-29 12:31:49 -04:00
Brad King 5bd94332c7 Merge topic 'clang-warnings' 
37859e3244 Source: Fix clang -Wimplicit-fallthrough warnings
907d098838 Source: Fix clang -Wextra-semi warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6561
 2021-09-29 09:57:47 -04:00
Brad King 84673a8243 Merge topic 'xcode-dead-code' 
b8a2ce0484 cmGlobalXCodeGenerator: Remove dead buildsystem version check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6568
 2021-09-29 09:57:00 -04:00
Brad King a074204986 Merge topic 'xcode-generation-support-inl-files' 
16ea0e57f7 Xcode: Treat .inl files as C++ header files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6563
 2021-09-29 09:56:02 -04:00
Brad King 487b011574 Merge topic 'GetPrerequisites-objdump-exe' 
403f343082 GetPrerequisites: Support CMAKE_OBJDUMP with .exe extension

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6566
 2021-09-29 09:52:16 -04:00
Brad King 9b1fc61722 Merge topic 'nasm-defines-fix' 
9b94f95bed ASM_NASM: Pass preprocessor definitions to assembler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6567
 2021-09-29 09:51:20 -04:00
Kitware Robot 700f76299c CMake Nightly Date Stamp 2021-09-29 00:01:13 -04:00