mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-01 03:11:08 -06:00
Code Issues Packages Projects Releases Wiki Activity
54,695 Commits 2 Branches 385 Tags
d6746fd05c92a8edb94de746846227e6101fc05e
Commit Graph

54695 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Sean McBride
37859e3244 Source: Fix clang -Wimplicit-fallthrough warnings 2021-09-28 10:53:54 -04:00
Jake Turner
16ea0e57f7 Xcode: Treat .inl files as C++ header files 
Generate the `explicitFileType` as `sourcecode.cpp.h` instead of just
`sourcecode`.  This enables syntax highlighting in Xcode.
 2021-09-28 10:49:04 -04:00
Brad King
b8a2ce0484 cmGlobalXCodeGenerator: Remove dead buildsystem version check 
In commit 8d5f4c4db9 (Xcode: Switch to the "new build system" for Xcode
12 and above, 2020-09-14, v3.19.0-rc1~143^2~7) we accidentally added
code in an `else` block that under the opposite condition by which
the block can be entered.  Remove it.

Fixes: #22681
 2021-09-28 10:42:48 -04:00
Wirtos_new
9b94f95bed ASM_NASM: Pass preprocessor definitions to assembler 
Add the `<DEFINES>` placeholder to `CMAKE_ASM_NASM_COMPILE_OBJECT`.

Fixes: #22694
 2021-09-28 10:14:50 -04:00
Daniel Schlegel
403f343082 GetPrerequisites: Support CMAKE_OBJDUMP with .exe extension 
When running `fixup_bundle` in a MSYS environment it fails because
`gp_tool` resolves to `objdump.exe` and not just `objdump`.

Fixes: #22381
 2021-09-28 10:11:00 -04:00
Sean McBride
907d098838 Source: Fix clang -Wextra-semi warnings 2021-09-28 09:59:24 -04:00
Brad King
09dd52c9d2 Merge topic 'tutorial_update_step_8' 
f55a02a26e Tutorial: Enhance CTestConfig info in Step 8

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6565
 2021-09-28 09:56:14 -04:00
Kitware Robot
966d9b3967 CMake Nightly Date Stamp 2021-09-28 00:01:17 -04:00
Brad King
71c50f0019 Merge branch 'release-3.21' 2021-09-27 13:48:57 -04:00
Brad King
a21d5455c0 Merge topic 'autogen-dep-on-imported-implib-only-target' 
895fa3433f cmQtAutoGenInitializer: support IMPLIB-only imported targets
354c1f5628 Tests/RunCMake/Autogen: test CMP0111 behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6558
 2021-09-27 13:48:57 -04:00
Brad King
12b999e66a Merge topic 'autogen-dep-on-imported-implib-only-target' into release-3.21 
895fa3433f cmQtAutoGenInitializer: support IMPLIB-only imported targets
354c1f5628 Tests/RunCMake/Autogen: test CMP0111 behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6558
 2021-09-27 13:48:56 -04:00
Brad King
16b54616ca Merge topic 'update-curl' 
5b117bddd0 Merge branch 'upstream-curl' into update-curl
c4f76b28dc curl 2021-09-22 (c7aef0a9)
71ea2d607d curl: Update script to get curl 7.79.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6560
 2021-09-27 13:48:03 -04:00
Brad King
6c4ebcbf40 Merge topic 'tutorial_update_stage_2' 
68e0f72744 Tutorial: Describe placement of add_subdirectory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6559
 2021-09-27 13:46:58 -04:00
Brad King
8dc72232d9 Merge topic 'iar-lang-spec-detection' 
a9073db736 IAR: update language specification detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6458
 2021-09-27 13:46:03 -04:00
Joseph Snyder
f55a02a26e Tutorial: Enhance CTestConfig info in Step 8 
Add a copy of the CTestConfig.cmake from Step 9 into the directory for
Step 8.

Expand the information about the contents of the CTestConfig file and
write a brief explanation of where on CDash to acquire the CTestConfig
file for a specific project.

CMake Issue: #22663
 2021-09-27 10:11:17 -04:00
Kitware Robot
b0c2aeaab4 CMake Nightly Date Stamp 2021-09-27 00:01:25 -04:00
Kitware Robot
1edc9e8887 CMake Nightly Date Stamp 2021-09-26 00:01:28 -04:00
Craig Scott
d277d797de Merge topic 'doc-find_package-restructure' 
84e02be51c Help: Restructure the find_package() docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !6542
 2021-09-25 03:39:33 -04:00
Kitware Robot
c42a5a6d93 CMake Nightly Date Stamp 2021-09-25 00:01:17 -04:00
Ben Boeckel
895fa3433f cmQtAutoGenInitializer: support IMPLIB-only imported targets 
Instead of using the target name directly (which ends up in the `Ninja`
generators querying for the `LOCATION` parameter), wrap up the target
name in a `$<TARGET_LINKER_FILE:>` to avoid the query for the unset
property.
 2021-09-24 11:29:54 -04:00
Ben Boeckel
354c1f5628 Tests/RunCMake/Autogen: test CMP0111 behavior 
On Windows, imported shared libraries which only have an
`IMPORTED_IMPLIB` set fail if they are depended upon by a target using
automoc. Add a test for the behavior of depending upon all imported
target types from an automoc-using target.
 2021-09-24 11:29:54 -04:00
Brad King
5b117bddd0 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2021-09-22 (c7aef0a9)
 2021-09-24 10:04:49 -04:00
Curl Upstream
c4f76b28dc curl 2021-09-22 (c7aef0a9) 
Code extracted from:

    https://github.com/curl/curl.git

at commit c7aef0a945f9b6fb6d3f91716a21dfe2f4ea635f (curl-7_79_1).
 2021-09-24 10:03:55 -04:00
Brad King
71ea2d607d curl: Update script to get curl 7.79.1 2021-09-24 10:03:35 -04:00
Brad King
2974ea7c3e Merge topic 'irsl-intel-variants' 
956160bb9a IRSL: Fix search for Windows redist files with Intel Classic compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6557
 2021-09-24 09:16:10 -04:00
Brad King
4e23745093 Merge topic 'mpi-cross' 
0723b2c935 MPI: Add fallback detection code for MPI when cross compiling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6537
 2021-09-24 09:15:17 -04:00
Brad King
6e6ad6e02e Merge branch 'release-3.21' 2021-09-24 09:14:20 -04:00
Brad King
1f8b4afbce Merge topic 'FindMatlab-r2021b' 
a013404f43 FindMatlab: Add R2021b => 9.11 version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6556
 2021-09-24 09:14:20 -04:00
Brad King
afd4d25280 Merge topic 'FindMatlab-r2021b' into release-3.21 
a013404f43 FindMatlab: Add R2021b => 9.11 version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6556
 2021-09-24 09:14:19 -04:00
Joseph Snyder
68e0f72744 Tutorial: Describe placement of add_subdirectory 
Clarify that the process of making a target optional in the second step
of the tutorial is further steps to the work done before, not
a separate addition to the file.

Do this by ensuring that the paragraph which describes the work done
mentions the placement and use of the previous command.
This is done to avoid duplication of the add_subdirectory call.

CMake Issue: #22663
 2021-09-24 08:59:23 -04:00
Kitware Robot
d2541062bd CMake Nightly Date Stamp 2021-09-24 00:01:17 -04:00
Felipe Torrezan
a9073db736 IAR: update language specification detection 2021-09-23 22:09:57 +02:00
Brad King
956160bb9a IRSL: Fix search for Windows redist files with Intel Classic compiler 
The oneAPI icx/ifx compilers are under `.../windows/bin`.
The classic icl/ifort compilers are under `.../windows/bin/intel64`.
Add paths to the redist directory relative to both locations.

Fixes: #22673
 2021-09-23 11:45:35 -04:00