mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-28 18:09:42 -05:00
Code Issues Packages Projects Releases Wiki Activity
52,980 Commits 2 Branches 401 Tags
888489275f7166c1ce32b990408b501bf6a78d47
Commit Graph

30668 Commits

Author SHA1 Message Date
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
Kitware Robot 8146fcddc0 CMake Nightly Date Stamp 2021-05-08 00:01:08 -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
Kitware Robot f0ecd91301 CMake Nightly Date Stamp 2021-05-07 00:01:11 -04: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
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
Robert Maynard a9b968bb98 cmake-presets: Introduce toolchainFile preset option 
In v3 of the presets, the `--toolchain` command line argument now
has a preset mapping.
 2021-04-28 17:22:25 -04:00
Marc Chevrier 46896d98bb foreach(): loop variables are only available in the loop scope 
Fixes: #20553
 2021-04-28 19:44:25 +02:00
Brad King f881b4e4cc cmCPackDebGenerator: Remove unused local variable 2021-04-28 10:09:52 -04:00
Brad King 5ad8862318 Source: Convince NVHPC that RAII variables are used 2021-04-28 10:09:52 -04:00
Brad King 1898f9dd82 cmFileCommand: Remove unused local variable 2021-04-28 10:09:52 -04:00
Brad King 6a003c6f35 cmSystemTools: Avoid unreachable code warning on NVHPC 2021-04-28 10:09:52 -04:00
Brad King 16275c7f82 LexerParser: Suppress NVHPC warnings in generated code 2021-04-28 10:09:35 -04:00
Brad King cefda16d35 LexerParser: Regenerate parsers with bison 3.7.5 2021-04-28 10:08:22 -04:00
Brad King 11530e5504 Merge topic 'ARMClang-cpu-arch-flags' 
c4941b7e66 ARMClang: Do not automatically add cpu/arch compile or link options
0078db3888 ARMClang: Separate cpu/arch flags from preceding flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jaeden Amero <kitware@patater.com>
Merge-request: !6035
 2021-04-28 09:49:41 -04:00
Kitware Robot 857373c53c CMake Nightly Date Stamp 2021-04-28 00:01:11 -04:00