mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-25 16:09:42 -06:00
Code Issues Packages Projects Releases Wiki Activity
52,185 Commits 2 Branches 386 Tags
1b2db411ad7ad2ffdc9ec0d1ed60ed0cdce4f8b9
Commit Graph

11437 Commits

Author SHA1 Message Date
Brad King
957a117c70 Merge topic 'android-r22' 
005e2cdfb0 Android: Do not use gold for ndk >= r22
ed7a87f270 Tests: Update RunCMake.Android for NDK r22
4950d35733 Help: Document CMAKE_ANDROID_NDK_VERSION variable
746906242d Android: Detect NDK version number

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5862
 2021-03-03 11:11:58 -05:00
Haibo Huang
005e2cdfb0 Android: Do not use gold for ndk >= r22 
Fixes: #21772
 2021-03-03 10:28:56 -05:00
Haibo Huang
746906242d Android: Detect NDK version number 
Report it in `CMAKE_ANDROID_NDK_VERSION`.
 2021-03-03 10:26:36 -05:00
Brad King
3aec26660a Merge topic 'nasm_add_deps' 
48e74ec1e6 ASM_NASM: generate depfiles for other makefiles
fcf16e9459 ASM_NASM: Add depfile generation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5868
 2021-03-03 09:06:06 -05:00
Brad King
aa10501d32 Merge topic 'compilerid_require_success' 
1bd8f19453 CMakeDetermineCompilerId: Fix REQUIRE_SUCCESS with multiple user flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5874
 2021-03-03 09:03:34 -05:00
Raul Tambre
1bd8f19453 CMakeDetermineCompilerId: Fix REQUIRE_SUCCESS with multiple user flags 
Need to quote the list expansion otherwise we'll try each argument separately.
 2021-03-02 16:20:45 +02:00
Brad King
0d4e93e88b Merge topic 'Tocic-master-patch-04743' 
507710438d FindBoost: Fix typo in documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5869
 2021-03-02 08:46:41 -05:00
Brad King
b212fba208 Merge topic 'FindOpenGL-GLX-no-GLVND' into release-3.20 
fb4b2ed0d3 FindOpenGL: handle GLX without GLVND

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5861
 2021-03-02 08:45:59 -05:00
Brad King
579c383336 Merge topic 'FindOpenGL-GLX-no-GLVND' 
fb4b2ed0d3 FindOpenGL: handle GLX without GLVND

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5861
 2021-03-02 08:45:59 -05:00
Francesco Bertolaccini
48e74ec1e6 ASM_NASM: generate depfiles for other makefiles 2021-03-02 12:27:47 +01:00
Francesco Bertolaccini
fcf16e9459 ASM_NASM: Add depfile generation 2021-03-01 15:21:17 -05:00
Tocic
507710438d FindBoost: Fix typo in documentation 2021-03-01 14:58:10 -05:00
Brad King
11506eb129 Merge topic 'FindDoxygen-policy-warnings' 
79fa7529e0 FindDoxygen: Prevent CMP0054 policy warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5864
 2021-03-01 14:57:39 -05:00
Brad King
0034289d06 Merge topic 'compilerid_require_success' 
bdc40742bd CMakeDetermineCompilerId: Test without COMPILER_ID_FLAGS if REQUIRE_SUCCESS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5863
 2021-03-01 14:56:31 -05:00
Brad King
7a10aa922d Merge topic 'FindIntl-FindIconv-versions' 
a9b11a06f5 FindIntl: Add version support
01e9922db5 FindIconv: Add version support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5852
 2021-03-01 14:55:10 -05:00
Craig Scott
47f2d367a4 Merge topic 'FetchContent-docs' 
24b467c043 Help: Prefer commit hashes in FetchContent examples for security reasons
ebcb8896e3 Help: Add missing MD5= for URL_HASH in FetchContent example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5834
 2021-02-27 23:23:39 -05:00
Craig Scott
79fa7529e0 FindDoxygen: Prevent CMP0054 policy warnings 
Fixes: #21871
 2021-02-28 11:34:05 +11:00
Raul Tambre
bdc40742bd CMakeDetermineCompilerId: Test without COMPILER_ID_FLAGS if REQUIRE_SUCCESS 
If we REQUIRE_SUCCESS, i.e. TEST_FLAGS_FIRST must work, we need to also try
without user flags.

Fixes #21869.
 2021-02-27 14:25:26 +02:00
Ben Boeckel
fb4b2ed0d3 FindOpenGL: handle GLX without GLVND 
On Ubuntu, installing `libgl-dev` provides `libGL` and `libGLX`, but no
`libOpenGL`. Avoid defining GLVND targets without the `OpenGL::OpenGL`
target.
 2021-02-26 15:36:55 -05:00
Raul Tambre
8211b4706f IntelLLVM: C17 support 
Issue: #17755
 2021-02-25 12:50:45 -05:00
Raul Tambre
b9c3acac02 GNU: C23 support 
Added in commit 9f936c861383dc69e0053e34315d5d0262a19e8f, released in 9.1.
 2021-02-25 18:22:32 +02:00
Raul Tambre
c9f0613c2a GNU: C17 support 
Added in commit c76dc9c32d616eff1e0ae162042f1c0f8ca65fbf, released in 8.1.
Set as default in the same commit.

Issue: #17755
 2021-02-25 18:22:32 +02:00
Raul Tambre
10a72c0f1c Clang: Default C standard doesn't depend on compatibility mode 
MSVC compatibility mode doesn't affect the default standard.
 2021-02-25 18:22:32 +02:00
Raul Tambre
6c2e309a66 Clang: Set standard flags according to frontend variant 
They depend on the frontend not which compiler we're simulating.

Fixes #21771.
 2021-02-25 18:22:32 +02:00
Raul Tambre
9f81591dbf Clang: MSVC-style C flags 
Support added in LLVM commit d087d805acb664e885e9c31a916f6cfa5dbc2186, will be
released in Clang 13.
 2021-02-25 18:22:32 +02:00
Raul Tambre
72f4984cdc Clang: C23 support 
Added in LLVM commit d06f3917913d2558b771ccc48d838f8cd8993c01, released in
Clang 9.0.
 2021-02-25 18:22:32 +02:00
Raul Tambre
82239d43f8 Clang: C17 default version 
Switched in LLVM commit 91cdbd521a38495c66e30636943563ca70d3c022, released in
Clang 11.

Issue: #17755
 2021-02-25 18:22:29 +02:00
Raul Tambre
9024fb632e Clang: C17 support 
Added in LLVM commit 5b6c0f75e01571851b767dc63a3229c962f464f1, available since
Clang 6.

Issue: #17755
 2021-02-25 18:22:10 +02:00
Raul Tambre
dcd599757f C23 support 2021-02-25 18:22:10 +02:00
Raul Tambre
93b7d3d292 C17 support 
Implements #17755.
 2021-02-25 18:22:10 +02:00
Raul Tambre
58d9525233 Clang: Correct default C standards for ancient versions 
C11 was made default in LLVM commit ab506adf7d3ced6abcaf42f92de3d6cd15fa19e8,
released in 3.5.2.
C99 was made default in LLVM commit 17f76e04d244c80e70f1c81c94d4524b53d9772d,
released in 2.1. It was flipped a few times between C89 and C99 during the 2.1
cycle, but the C89 default never made it into a release.
 2021-02-25 18:22:10 +02:00
Raul Tambre
356e83c156 Clang: Correct C standards flags for ancient versions 
C89, C99 flags in LLVM commit ff43821d5380ee38aff421701f1d461242b524ee.
C90 flag in LLVM commit 229ce60fc9983df5f7e83e25fa6b5c0ca4d2b135.
C1x flag in LLVM commit a686b5f8bf7b5a2ab636c0c2de5ad4c174aa33e0.
C11 flag in LLVM commit 6784aeb9ef96e5735850fa7226ed0cb45cb82e75.

Mark C90, C99 full support since 2.1. Might've been possibly a little later,
but source spelunking that much back is difficult.

Mark C11 full support since 3.0, which added _Static_assert in LLVM commit
3d9cbdc3e66e274d5d3cb94ce81a65478d9baae0.
 2021-02-25 18:22:10 +02:00
Raul Tambre
f112450ea0 Clang: C flags cleanup 
Don't need to set the options to empty strings if not supported.
 2021-02-25 18:22:10 +02:00
Raul Tambre
7596d8b951 CMakeCCompilerId: Fix C standard detection in Clang MSVC mode 
Clang doesn't define __STDC__ if in MSVC compatibility mode, but does define
__STDC_VERSION__.
Avoid the fallback for this combination.
 2021-02-25 18:22:07 +02:00
Sibi Siddharthan
a9b11a06f5 FindIntl: Add version support 
Additional Changes: Rework the documentation of FindIntl

NOTES:
Reorder the REQUIRED_VARS arguments so find_package reports the library
instead of the include directory.
Handle Intl_LIBRARY in the same way how FindIconv handles it in case of glibc.
If the VERSION_VAR argument is an empty string nothing happens.

Fixes: #21857
 2021-02-25 20:18:56 +05:30
Sibi Siddharthan
01e9922db5 FindIconv: Add version support 
Issue: #21857
 2021-02-25 20:18:55 +05:30
Brad King
4250c5f91b Merge topic 'cuda_clang_implicit' 
23753be1cc Clang/CUDA: Restore needed references to implicit link variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5855
 2021-02-25 09:03:07 -05:00
Brad King
6288974ba5 Merge topic 'nvhpc-minor-fixes' 
72efd95add PGI: Explicitly specify CMAKE_CXX98_STANDARD_COMPILE_OPTION
6bfb2c6175 HELP: Update compile-features documentation with missing compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5857
 2021-02-25 09:02:02 -05:00
Harmen Stoppels
24b467c043 Help: Prefer commit hashes in FetchContent examples for security reasons 
Fixes: #21841
Co-Authored-By: Craig Scott <craig.scott@crascit.com>
 2021-02-25 21:14:15 +11:00
Craig Scott
ebcb8896e3 Help: Add missing MD5= for URL_HASH in FetchContent example 
Fixes: #21859
 2021-02-25 21:14:15 +11:00
Robert Maynard
72efd95add PGI: Explicitly specify CMAKE_CXX98_STANDARD_COMPILE_OPTION 
The PGI ( and NVIDIA HPC ) compilers default C++ standard level
are based on the GCC system headers it is compiling against.

Therefore on newer platforms the default C++ level will be >= 11
and requesting C++98 compilation mode will fail as no explicit
flag will be set.
 2021-02-24 13:47:03 -05:00
Raul Tambre
23753be1cc Clang/CUDA: Restore needed references to implicit link variables 
In commit 4620cf77f2 (Clang: Remove unused CUDA implicit link variables,
2021-02-14) we removed some references.  It turns out they are non-empty
and necessary if using a non-scattered installation.

Fixes: #21863
 2021-02-24 09:58:06 -05:00
Brad King
a70f8770f2 Merge topic 'better_cuda_compiler_detection_error_messages' into release-3.20 
a0fc64ac24 CUDA: Improve error messages when CUDA compiler detection fails

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5844
 2021-02-24 09:47:39 -05:00
Brad King
35b448a7dd Merge topic 'better_cuda_compiler_detection_error_messages' 
a0fc64ac24 CUDA: Improve error messages when CUDA compiler detection fails

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5844
 2021-02-24 09:47:39 -05:00
Robert Maynard
a0fc64ac24 CUDA: Improve error messages when CUDA compiler detection fails 2021-02-23 09:21:42 -05:00
Brad King
e1ea0c9540 Merge topic 'nag-fortran-include-moddir' into release-3.20 
ec030877a2 NAG: Fix using Fortran modules from their output directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5842
 2021-02-23 08:06:30 -05:00
Brad King
788f231e4c Merge topic 'nag-fortran-include-moddir' 
ec030877a2 NAG: Fix using Fortran modules from their output directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5842
 2021-02-23 08:06:30 -05:00
Brad King
e9efa04d8d Merge topic 'fix-IS_NEWER_THAN-usage' into release-3.20 
b0da671243 FetchContent: Don't update timestamps if files don't change
404cddb7bb ExternalProject: Fix misuse of IS_NEWER_THAN in timestamp checks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5825
 2021-02-22 11:05:45 -05:00
Brad King
300a471245 Merge branch 'backport-FetchContent-timestamps' into fix-IS_NEWER_THAN-usage 2021-02-22 11:02:43 -05:00
Craig Scott
8c93e3232f GoogleTest: Fix misuse of IS_NEWER_THAN in timestamp check 
When using a file system which only has second resolution timestamps,
there is a reasonably high likelihood of timestamps being the same.
The IS_NEWER_THAN test returns true when timestamps are the same,
so don't redo test discovery when they match exactly.
 2021-02-22 11:02:38 -05:00