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,385 Commits 2 Branches 401 Tags
8dcdd4351fd6236f05fbb613cd805fb41d2a1865
Commit Graph

30878 Commits

Author SHA1 Message Date
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
Kitware Robot 576a07059e CMake Nightly Date Stamp 2021-05-04 00:01:08 -04:00
Kinan Mahdi 31bbcd1905 VS: Fix CSharp sources inside build directory 
Fixes: #22104
 2021-05-03 11:25:42 -04:00
Brad King 4419b944fd Merge topic 'ninja-multi-long-command-line-config' 
ad08f93ee4 Ninja Multi-Config: Split long command lines by config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6067
 2021-05-03 10:53:50 -04:00
Thomas Vaughan d8786bfa16 VS: Add support for per-config C# sources 
Fixes: #22108
 2021-05-03 10:49:47 -04:00
Brad King 4df3f5300a Merge topic 'foreach-loop-variable' 
46896d98bb foreach(): loop variables are only available in the loop scope

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Michael Hirsch <michael@scivision.dev>
Merge-request: !6044
 2021-05-03 09:59:35 -04:00
Brad King ec6ba9a3b8 Merge topic 'update-kwsys' 
11cadc3ef7 Merge branch 'upstream-KWSys' into update-kwsys
18513fa118 KWSys 2021-04-29 (5655d533)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6063
 2021-05-03 09:58:49 -04:00
Kitware Robot 8095cdd8c0 CMake Nightly Date Stamp 2021-05-03 00:01:14 -04:00
Kitware Robot 4f88cb1675 CMake Nightly Date Stamp 2021-05-02 00:01:06 -04:00
friendlyanon 4dd4e9dd6c cmGlobalGenerator: Add parallel parameter to GenerateCMakeBuildCommand 2021-05-01 16:08:21 +02:00
Kitware Robot a51ad60687 CMake Nightly Date Stamp 2021-05-01 00:01:06 -04:00
Kyle Edwards ad08f93ee4 Ninja Multi-Config: Split long command lines by config 
Fixes: #22123
 2021-04-30 14:46:21 -04:00
Kitware Robot 4b60072620 CMake Nightly Date Stamp 2021-04-30 00:01:09 -04:00
Brad King 1ad4501ae9 CMake 3.20.2 2021-04-29 09:53:54 -04:00
Brad King 11cadc3ef7 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-04-29 (5655d533)
 2021-04-29 09:45:42 -04:00
Brad King e2ac92681c Merge topic 'nvhpc-warnings' 
f881b4e4cc cmCPackDebGenerator: Remove unused local variable
5ad8862318 Source: Convince NVHPC that RAII variables are used
1898f9dd82 cmFileCommand: Remove unused local variable
6a003c6f35 cmSystemTools: Avoid unreachable code warning on NVHPC
16275c7f82 LexerParser: Suppress NVHPC warnings in generated code
cefda16d35 LexerParser: Regenerate parsers with bison 3.7.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6049
 2021-04-29 09:21:37 -04:00
Brad King de76de9606 Merge topic 'vs-VCTargetsPath-Platform' 
3db61cf985 VS: Fix VCTargetsPath detection when cross-compiling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6053
 2021-04-29 09:17:14 -04:00
Kitware Robot 60288129db CMake Nightly Date Stamp 2021-04-29 00:04:13 -04:00