Commit Graph

64573 Commits

Author SHA1 Message Date
leha-bot
4f160f7906 cmakemain: Return the SCRIPT_MODE exit code if it was set
We determine it via checking cmake.Run() return code and
ScriptModeExitCode. If ScriptModeExitCode is zero, then we would return
1 if retcode was non-zero. Otherwise it will be returned if retcode was
  also non-zero.
2024-01-16 10:41:31 +03:00
leha-bot
b62dcbf5d2 cmMakefile: check cmake script mode exit code after command
Which potentially may set it, and forward it to the cmExecutionStatus
for proper handling in caller.
2024-01-16 10:41:31 +03:00
leha-bot
3d9d504646 cmMakefile: Store the exit code from cmExecutionStatus to cmake instance 2024-01-16 10:41:31 +03:00
leha-bot
9f6c937408 Source/cmake.h: Add ScriptModeExitCode for proper storing exit code
From executed CMake script in SCRIPT_MODE.
2024-01-16 10:41:31 +03:00
leha-bot
1082b9cb9a cmExecutionStatus: Add ability to set optional custom exit code 2024-01-16 10:41:31 +03:00
Kitware Robot
a68d899874 CMake Nightly Date Stamp 2024-01-16 00:01:06 -05:00
Kitware Robot
76db09fd75 CMake Nightly Date Stamp 2024-01-15 00:01:56 -05:00
Kitware Robot
8f85931b8a CMake Nightly Date Stamp 2024-01-14 00:01:10 -05:00
Kitware Robot
1d97e51c75 CMake Nightly Date Stamp 2024-01-13 00:01:07 -05:00
Brad King
e315d7cb19 Merge topic 'swift-sources-in-resp-file'
b767917ebb Swift/Ninja: Include sources in response file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9143
2024-01-12 08:53:10 -05:00
Kitware Robot
8728fb1efc CMake Nightly Date Stamp 2024-01-12 00:01:11 -05:00
Brad King
c6d69d84db Merge topic 'file-strings-regex-match'
fa00928bcd file: `STRINGS` + `REGEX` store match results
ff0085cf74 Help: Drop incorrect versionadded mark from CMAKE_MATCH_<n>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9124
2024-01-11 10:07:48 -05:00
Brad King
97713da650 Merge topic 'swift-implib'
a2aad7eb8d Swift: fix Windows DLL import library support for CMP0157 NEW

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Jeremy Day <jadaytime@gmail.com>
Merge-request: !9140
2024-01-11 10:06:39 -05:00
Brad King
1c02642ee6 Merge topic 'package-dispatch-apple'
2a398cd9b6 CMakePackageConfigHelpers: Clarify generate_apple_*_selection_file signatures

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9130
2024-01-11 10:05:49 -05:00
Brad King
d3d6c41d7f Merge topic 'ci-linkcheck'
5b302bf5fe FindCxxTest: Drop broken anchor on link to cxxtest project page

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9146
2024-01-11 10:01:41 -05:00
Brad King
4bc3317c64 Merge branch 'release-3.28' 2024-01-11 09:59:53 -05:00
Brad King
930f2f51d9 Merge topic 'update-zlib'
941b948a85 Merge branch 'upstream-zlib' into update-zlib
5d030dc716 zlib 2022-10-12 (04f42cec)
b7379f9e21 zlib: Update script to get zlib 1.2.13

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !9145
2024-01-11 09:59:53 -05:00
Brad King
01e3eb91b8 Merge topic 'update-zlib' into release-3.28
941b948a85 Merge branch 'upstream-zlib' into update-zlib
5d030dc716 zlib 2022-10-12 (04f42cec)
b7379f9e21 zlib: Update script to get zlib 1.2.13

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !9145
2024-01-11 09:59:52 -05:00
Kitware Robot
d8d895260f CMake Nightly Date Stamp 2024-01-11 00:01:11 -05:00
Evan Wilde
b767917ebb Swift/Ninja: Include sources in response file
Unlike C/C++, Swift compiles all sources in a module at once. This can
quickly overwhelm the commandline length limit on Windows, so it is
useful to place the source files in the response file.

Issue: #25572
2024-01-10 16:08:16 -08:00
Brad King
5b302bf5fe FindCxxTest: Drop broken anchor on link to cxxtest project page 2024-01-10 13:48:09 -05:00
Saleem Abdulrasool
a2aad7eb8d Swift: fix Windows DLL import library support for CMP0157 NEW
This was accidentally removed when the command templates were
reorganized to introduce the new policy. Restore the flag in the shared
library creation to ensure that we emit the import libraries to the
correct location.
2024-01-10 08:02:36 -08:00
Brad King
941b948a85 Merge branch 'upstream-zlib' into update-zlib
* upstream-zlib:
  zlib 2022-10-12 (04f42cec)

Fixes: #25576
2024-01-10 10:29:17 -05:00
zlib upstream
5d030dc716 zlib 2022-10-12 (04f42cec)
Code extracted from:

    https://github.com/madler/zlib.git

at commit 04f42ceca40f73e2978b50e93806c2a18c1281fc (v1.2.13).
2024-01-10 10:29:05 -05:00
Brad King
b7379f9e21 zlib: Update script to get zlib 1.2.13
Issue: #25576
2024-01-10 10:28:46 -05:00
Brad King
1e8b283554 Merge topic 'static'
9e829779f2 Swift: preserve `-static` for static library swiftmodules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9141
2024-01-10 10:20:37 -05:00
Brad King
4a9599927f Merge topic 'orkun_refactor_09_01_2024'
63d4e4ec28 Makefile: Reduce string copies
4d928592eb Makefile: Remove redundant push_back
3e533bd64f Makefile: Improve const correctness
c2dd5dfbe8 Makefile: Remove no-op call

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9142
2024-01-10 10:19:12 -05:00
Brad King
8dc079581e Merge branch 'release-3.28' 2024-01-10 10:17:03 -05:00
Brad King
899a1f64af Merge topic 'vs-scan-for-modules'
405dc7d19c Tests/CXXModules/scan_properties: use `ixx` extension
029ddc3410 cmVisualStudio10TargetGenerator: always specify scanning
6c9614cbf4 Tests/CXXModules: add a test case for VS generation without flags
34f4423851 cmVisualStudio10TargetGenerator: fix typo in flag name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9104
2024-01-10 10:17:03 -05:00
Brad King
3160b136b2 Merge topic 'vs-scan-for-modules' into release-3.28
405dc7d19c Tests/CXXModules/scan_properties: use `ixx` extension
029ddc3410 cmVisualStudio10TargetGenerator: always specify scanning
6c9614cbf4 Tests/CXXModules: add a test case for VS generation without flags
34f4423851 cmVisualStudio10TargetGenerator: fix typo in flag name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9104
2024-01-10 10:17:01 -05:00
Brad King
5ef0e9f0ae Merge branch 'release-3.28' 2024-01-10 10:15:46 -05:00
Brad King
446abdf324 Merge topic 'cxxmodules-no-unity'
63bbb3768d cmLocalGenerator: ignore scanned sources for unity builds
76b5383123 cmGlobalGenerator: add unity sources after computing target compile features
7fc2a83fe6 Tests/CXXModules: add a test with unity build support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9118
2024-01-10 10:15:46 -05:00
Brad King
2858af8d6b Merge topic 'cxxmodules-no-unity' into release-3.28
63bbb3768d cmLocalGenerator: ignore scanned sources for unity builds
76b5383123 cmGlobalGenerator: add unity sources after computing target compile features
7fc2a83fe6 Tests/CXXModules: add a test with unity build support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9118
2024-01-10 10:15:44 -05:00
Brad King
8c4f0bf6a3 Merge branch 'release-3.28' 2024-01-10 10:14:24 -05:00
Brad King
711e3f955a Merge topic 'makefile-depfile'
7198f0d149 Makefile: Fix double escaping when DEPFILE is used
5162ff64d4 Makefile: Reduce string copies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9138
2024-01-10 10:14:24 -05:00
Brad King
3d14d84443 Merge topic 'makefile-depfile' into release-3.28
7198f0d149 Makefile: Fix double escaping when DEPFILE is used
5162ff64d4 Makefile: Reduce string copies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9138
2024-01-10 10:14:23 -05:00
Kitware Robot
87200ec97f CMake Nightly Date Stamp 2024-01-10 00:01:08 -05:00
Cristian Le
fa00928bcd file: STRINGS + REGEX store match results
Signed-off-by: Cristian Le <cristian.le@mpsd.mpg.de>
2024-01-09 16:36:55 -05:00
Brad King
ff0085cf74 Help: Drop incorrect versionadded mark from CMAKE_MATCH_<n>
It was added by commit 496ec6036f (Help: Add Sphinx 'versionadded'
directives to each top-level document, 2020-07-06, v3.19.0-rc1~558^2)
because the document happened to be added during the 3.9 release series,
but the variable has existed since the beginning.
2024-01-09 16:31:53 -05:00
Saleem Abdulrasool
9e829779f2 Swift: preserve -static for static library swiftmodules
The `-static` is important for the emission of the module as it is
serialized into the swiftmodule which then is used by the Swift frontend
to decide how to link to the symbol (via the GOT or not, or the IAT on
Windows). This repairs building static libraries with Swift on Windows.
2024-01-09 09:13:34 -08:00
Brad King
38234058ff Merge topic 'ctest-cli-http-headers'
20adf8cfce ctest: allow HTTP headers via command line

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9123
2024-01-09 10:54:54 -05:00
Brad King
7557a722a5 Merge topic 'ewilde/swift-ninja-response-files'
a6a5c43300 Swift/Ninja: Add support for response files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9098
2024-01-09 10:53:59 -05:00
Brad King
1c97c57455 Merge topic 'ninja-always-make-object-dirs'
de3dc16b64 cmNinjaTargetGenerator: use `.` for the needed phony order-only dependency
1aa28f3b92 cmNinjaTargetGenerator: ensure that the object output directory exists
4a9613ff9b cmNinjaTargetGenerator: add a method to compute the object directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9105
2024-01-09 10:52:42 -05:00
Brad King
60175f073c Merge topic 'doc-INSTALL_PREFIX'
925f9f18dd Help: INSTALL_PREFIX in install(CODE|SCRIPT) was added in CMake 3.27

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Acked-by: Frank Dana <ferdnyc@gmail.com>
Merge-request: !9135
2024-01-09 10:51:29 -05:00
Orkun Tokdemir
7198f0d149 Makefile: Fix double escaping when DEPFILE is used
In commit cfd8a5ac1f (Makefiles: Add support of DEPFILE for
add_custom_command, 2020-12-04, v3.20.0-rc1~237^2~1) we added a
`ConvertToOutputPath` call on a path given to the `depends` field of
`WriteMakeRule`.  The latter already handles escaping for Makefile
syntax.

Fixes: #25554
2024-01-09 10:44:43 -05:00
Brad King
dda4232b4d Merge topic 'cpack-nuget-readme'
ccde6f8048 CPack/NuGet: Add support for repository tag
2c616e85cf CPack/NuGet: Add support for readme tag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9139
2024-01-09 09:59:18 -05:00
Brad King
27d958b34c Merge topic 'cmake-gui-unused-slot'
3f3c387a96 cmake-gui: Remove unused viewType slot

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9137
2024-01-09 09:54:30 -05:00
Brad King
7e81c6fce9 Merge topic 'lcc-updates'
fe1903326c Tests: Avoid procedure stack overflow in broken libc on Elbrus
b7f9d24b40 Tests: Improve RunCMake.export expected output matching robustness
3377141c8f Tests: With lfortran < 1.24 skip cases broken by incorrect filename handling
020e80d825 LCC: Add missing C/CXX compiler version checks for -std options
76a0a67026 GetPrerequisites: Tolerate multiple leading '/' in system library paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9099
2024-01-09 09:52:55 -05:00
Ben Boeckel
405dc7d19c Tests/CXXModules/scan_properties: use ixx extension
This ensures that Visual Studio is told not to scan this explicitly.
2024-01-09 09:47:47 -05:00
Orkun Tokdemir
63d4e4ec28 Makefile: Reduce string copies 2024-01-09 13:05:01 +01:00