mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 04:40:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
53,127 Commits 2 Branches 401 Tags
0a0a0f8a744e2bfa35cdbc90db6e4e23adadd59b
Commit Graph

30745 Commits

Author SHA1 Message Date
Brad King 4281cd15db clang-tidy: fix bugprone-redundant-branch-condition 2021-05-11 15:08:08 -04:00
Marc Chevrier f5fa6d53b0 class cmake: Store working directory at cmake launch 2021-05-11 18:16:08 +02:00
Marc Chevrier b1729200c3 find_*: refactor cache variable handling 2021-05-11 18:16:08 +02:00
Vitaly Stakhovsky 5e8fa0b7bc Source: Minor code improvements 2021-05-11 11:20:04 -04:00
Brad King ee87e53d37 Merge topic 'windows-artifact-symlinks' 
d0c31cbff9 Windows: Use real artifact versioning symlinks if possible

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6093
 2021-05-11 09:28:49 -04:00
Brad King 553cd4db44 Merge topic 'fixAppleResourceWarning' 
169da7cd81 Do not show RESOURCE DESTINATION warning for MACOSX_BUNDLE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6104
 2021-05-11 09:27:45 -04:00
Brad King a94332ed37 Merge topic 'cmprop-nullptr' 
ce97b7909b Source: Remove unnecessary comparisons to nullptr

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6112
 2021-05-11 09:26:39 -04:00
Brad King d0b6eb8ec7 Merge topic 'capabilties-generator-platforms' 
66be34853c cmake: add supported platforms to cmake -E capabilties report

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6102
 2021-05-11 09:22:47 -04:00
Kitware Robot fdab87312c CMake Nightly Date Stamp 2021-05-11 00:01:09 -04:00
Brad King a77cda587b Merge topic 'build-with-qt6-deprecations' 
6c657173d8 cmake-gui: Address deprecation warnings with Qt6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sankhesh Jhaveri <sankhesh.jhaveri@kitware.com>
Merge-request: !6107
 2021-05-10 12:21:45 -04:00
Vitaly Stakhovsky ce97b7909b Source: Remove unnecessary comparisons to nullptr 2021-05-10 11:44:53 -04:00
Georg Schwab d0c31cbff9 Windows: Use real artifact versioning symlinks if possible 
When cross compiling from Windows to a platform that uses SONAMEs, real
symlinks are now created for the VERSION and SOVERSION links instead of
copies, if the user has the necessary privileges.

Fixes: #22128
 2021-05-10 11:12:28 -04:00
scheffle 66be34853c cmake: add supported platforms to cmake -E capabilties report 2021-05-10 10:28:28 -04:00
Brad King 2ee55f9718 Merge topic 'remove-unused-Command-member' 
1aa4f97c97 cmCTestGenericHandler: Remove unused Command member

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6106
 2021-05-10 10:15:50 -04:00
Brad King 3928f31a26 Merge topic 'codespell' 
fd02f10103 Xcode: Fix typos and spelling in error message
5950e54325 Source: Fix typos and spelling in comments
7072d83772 Help: Fix typos and spelling in documentation
03b1140ddc CONTRIBUTING: Fix typos and spelling
87f8843d8b FindMatlab: Fix spelling in warning and documentation
15cc39ed7f Modules: Fix typos and spelling in documentation
f015c36c5a Modules: Fix typos and spelling in comments of generated code
dad5b9d845 Modules: Fix typos and spelling in comments
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6099
 2021-05-10 10:13:06 -04:00
Brad King b00a0e1d68 Merge topic 'update-kwsys' 
ba87a84339 Merge branch 'upstream-KWSys' into update-kwsys
07727928f9 KWSys 2021-05-07 (979d7db0)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6101
 2021-05-10 10:12:10 -04:00
Brad King 3dd38ac36d Merge topic 'install-symlink-to-directory' 
d71a7cc19d install(FILES): Allow installation of symlinks to directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6098
 2021-05-10 10:11:04 -04:00
Brad King 74d35f5693 Merge topic 'windows-symlink-errors' 
d7522b8f86 cmSystemTools: Improve CreateLink and CreateSymlink error codes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6096
 2021-05-10 10:09:59 -04:00
Kitware Robot 9a318a6c7a CMake Nightly Date Stamp 2021-05-10 00:01:10 -04:00
Kitware Robot f22d807df4 CMake Nightly Date Stamp 2021-05-09 00:01:04 -04:00
Craig Scott 1aa4f97c97 cmCTestGenericHandler: Remove unused Command member 
This was causing a cppcheck warning about an uninitialized member in
the constructor. Since nothing was using it, remove it.
 2021-05-08 16:32:43 +10:00
Craig Scott 6c657173d8 cmake-gui: Address deprecation warnings with Qt6 2021-05-08 16:19:21 +10:00
Kitware Robot 8146fcddc0 CMake Nightly Date Stamp 2021-05-08 00:01:08 -04:00
Mike Achtelik 169da7cd81 Do not show RESOURCE DESTINATION warning for MACOSX_BUNDLE 
RESOURCE arguments are ignored on Apple platforms because the
associated files are installed into the appropriate locations
inside the framework folder. So we do not need to show a warning,
that no RESOURCE DESTINATION is defined.

Fixes #15676
 2021-05-07 21:16:08 +02:00
Josef Angstenberger fd02f10103 Xcode: Fix typos and spelling in error message 2021-05-07 17:00:18 +02:00
Josef Angstenberger 5950e54325 Source: Fix typos and spelling in comments 2021-05-07 17:00:18 +02:00
Brad King ba87a84339 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-05-07 (979d7db0)
 2021-05-07 09:26:05 -04:00
Brad King eac20afe9a Merge topic 'ctest-clicolor' 
df0e50d756 CTest: Add env var CLICOLOR to disable color output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6076
 2021-05-07 09:15:37 -04:00
Brad King d7522b8f86 cmSystemTools: Improve CreateLink and CreateSymlink error codes 
In commit 7f89053953 (cmSystemTools: Return KWSys Status from CreateLink
and CreateSymlink, 2021-04-15) we just took the `-err` from libuv and
treated it as a POSIX error.  This is accurate on POSIX, but on Windows
does not match the POSIX error codes.

Use `uv_fs_get_system_error` to get the actual system error code.
This requires libuv 1.38 or higher.  Require that for Windows, but
fall back to the previous approach on POSIX.
 2021-05-07 08:30:52 -04:00
Kitware Robot f0ecd91301 CMake Nightly Date Stamp 2021-05-07 00:01:11 -04:00
Jens Carl d71a7cc19d install(FILES): Allow installation of symlinks to directory 
Allow symbolic links to a directory to be installed via install(FILES ...).

Fixes: #22159
 2021-05-06 15:29:51 -07:00
Brad King 4141866dfe Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-05-06 (2fa93cfc)
 2021-05-06 11:53:18 -04:00
Martin Willers df0e50d756 CTest: Add env var CLICOLOR to disable color output 
Based on the implementation in Terminal.c:kwsysTerminalStreamIsVT100.
 2021-05-06 11:40:40 -04:00
Brad King e0b4a22ca6 Merge topic 'nmake-utf8' 
f3f57cc4ed NMake: Use UTF-8 with BOM if supported by nmake
186c9bff53 NMake: Check nmake version for support of UTF-8
8a4f536be6 NMake: Detect nmake version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6041
 2021-05-06 10:13:11 -04:00
Brad King 1f795ee40e Merge topic 'update-kwsys' 
4b73f113ba Merge branch 'upstream-KWSys' into update-kwsys
04c6e736f6 KWSys 2021-05-05 (e9ca4104)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6088
 2021-05-06 10:11:33 -04:00
Brad King 50225fb306 Merge topic 'objc-osx-architectures' 
5972094708 ObjectiveC: Respect OSX_ARCHITECTURES for OBJC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6090
 2021-05-06 10:10:18 -04:00
Kitware Robot 4cab7a6fc5 CMake Nightly Date Stamp 2021-05-06 00:01:10 -04:00
Amine Najahi f3f57cc4ed NMake: Use UTF-8 with BOM if supported by nmake 
Fixes: #21792
 2021-05-05 10:56:49 -04:00
Brad King 186c9bff53 NMake: Check nmake version for support of UTF-8 
NMake version 9 and above support UTF-8 encoded makefiles with a BOM.
 2021-05-05 10:56:49 -04:00
Brad King 8a4f536be6 NMake: Detect nmake version 
Run `nmake -?` and extract the version from its output.
Use a timeout because Watcom tools come with a `nmake` tool
that always waits for user input on `-?`.
 2021-05-05 10:55:55 -04:00
Brad King 5972094708 ObjectiveC: Respect OSX_ARCHITECTURES for OBJC 
Fix a typo from commit 940fc62962 (macOS: Respect OSX_ARCHITECTURES for
ASM, 2020-08-21, v3.19.0-rc1~270^2).

Fixes: #22152
 2021-05-05 10:45:01 -04:00
Brad King 4b73f113ba Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-05-05 (e9ca4104)
 2021-05-05 10:17:30 -04:00
Brad King 41f9486e61 Merge topic 'generate-cmake-build-command-parallel' 
d2b856bc92 ctest_build: Add the PARALLEL_LEVEL argument
fc2ac46043 build_command: Add the PARALLEL_LEVEL argument
4dd4e9dd6c cmGlobalGenerator: Add parallel parameter to GenerateCMakeBuildCommand

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !6069
 2021-05-05 10:11:46 -04:00
Danny Parker dfaf55fbfd Xcode: add extra '$(inherited)' entries using InheritBuildSettingAttribute. 
These have been added to:
GCC_PREPROCESSOR_DEFINITIONS
OTHER_CFLAGS
OTHER_LDFLAGS

This is to allow Cocoapods to work correctly as it uses xcconfig files to alter build settings in Xcode, and requires these build settings to inherit from their parent, not overwrite.
 2021-05-05 14:38:33 +01:00
Kitware Robot de0c8b4d98 CMake Nightly Date Stamp 2021-05-05 00:01:07 -04:00
friendlyanon d2b856bc92 ctest_build: Add the PARALLEL_LEVEL argument 
Fixes: #19712
 2021-05-04 20:30:18 +02:00
friendlyanon fc2ac46043 build_command: Add the PARALLEL_LEVEL argument 
Issue: #19712
 2021-05-04 20:17:17 +02:00
Brad King 09f2f5df89 Merge topic 'extend_toolchain_flag_to_cmake_preset' 
a9b968bb98 cmake-presets: Introduce `toolchainFile` preset option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6045
 2021-05-04 11:54:49 -04:00
Brad King 8314edd065 Merge topic 'vs-config-specific-csproj' 
d8786bfa16 VS: Add support for per-config C# sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6055
 2021-05-04 11:27:43 -04:00
Brad King 3e86fc40ac Merge topic 'vs-csharp-link' 
31bbcd1905 VS: Fix CSharp sources inside build directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6065
 2021-05-04 11:25:33 -04:00