Commit Graph

63753 Commits

Author SHA1 Message Date
scivision ae72b04418 Help: Document when <LANG>_COMPILER_ID genex learned to support multiple ids
It was added in CMake 3.15.
2023-11-07 13:47:43 -05:00
Brad King 5afd411ed0 Merge topic 'vs-CharacterSet'
cbddc66277 VS: Consider macros with values when determining CharacterSet

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8940
2023-11-07 09:10:00 -05:00
Brad King 8872da0fe4 Merge topic 'CMakeDetermineFortranCompiler-typo'
e82a8ab197 CMakeDetermineFortranCompiler: Fix typo in comment (CC -> FC)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8945
2023-11-07 09:08:33 -05:00
Brad King 92cc1f3b62 Merge topic 'Ninja-use-depslog'
bb7a0497ef cmTransformDepfile: warn when a depfile is not written to
c22c473bde Tests/Ninja*/CustomCommandDepfile: check that deps are in the database
b0177003e1 cmGlobalNinjaGenerator: tell `ninja` to actually read the depfile
45eff9145e cmAddCustomCommandCommand: use `cmStrCat`
c6445c615b Tests/RunCMake/Ninja: fix subdir prefix check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8911
2023-11-07 09:07:46 -05:00
Brad King 4b92515182 Merge topic 'ci-linkcheck'
d865d5bce1 ci: Do not linkcheck www.intel.com URLs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8948
2023-11-07 08:40:06 -05:00
Kitware Robot 4c52349b9e CMake Nightly Date Stamp 2023-11-07 00:01:10 -05:00
Deniz Bahadir cbddc66277 VS: Consider macros with values when determining CharacterSet
In order to determine what character-set (Unicode, Multi-Byte, none)
shall be set in the generated `*.vcxproj` files, CMake checks if one of
the macros `_UNICODE` or `_SBCS` are defined.
However, as these macros can be defined with or without a value, the
check should always recognize these macros whether they are defined with
a value or without. That is now assured by this commit.

Fixes: #25379
2023-11-06 23:41:23 +01:00
Brad King d865d5bce1 ci: Do not linkcheck www.intel.com URLs
They fail with a 403 Client Error, perhaps due to our once-per-day
request being classified as scraping.
2023-11-06 12:53:35 -05:00
Brad King dea37a4e7d Merge branch 'release-3.28' 2023-11-06 12:18:51 -05:00
Brad King ed154b3896 CMake 3.28.0-rc4 v3.28.0-rc4 2023-11-06 11:50:13 -05:00
Sylwester Arabas e82a8ab197 CMakeDetermineFortranCompiler: Fix typo in comment (CC -> FC) 2023-11-06 10:57:26 -05:00
Brad King 530deed998 Merge topic 'cmake-E-cat-stdin'
ab72846794 cmake -E cat: Add ability to print standard input

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8942
2023-11-06 10:35:45 -05:00
Kitware Robot a3e67a60de CMake Nightly Date Stamp 2023-11-06 00:01:38 -05:00
Craig Scott 768690ee9a Merge topic 'FetchContent-GHS'
6a81104413 FetchContent: Pass GHS Variables to subbuild

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8930
2023-11-05 18:47:52 -05:00
Kitware Robot 51d985da3e CMake Nightly Date Stamp 2023-11-05 00:01:07 -04:00
William Sciaroni 6a81104413 FetchContent: Pass GHS Variables to subbuild
Fixes: #24244
2023-11-05 08:42:27 +11:00
Kitware Robot 3a467f0f8e CMake Nightly Date Stamp 2023-11-04 00:01:08 -04:00
Brad King 8a7500a438 Merge topic 'CMakeFindPackageMode-link-docs'
c5388bd320 CMakeFindPackageMode: Link to cmake --find-package documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8943
2023-11-03 10:52:53 -04:00
Brad King d11757fb33 Merge branch 'release-3.28' 2023-11-03 10:38:49 -04:00
Brad King e07ad5ee9c Merge topic 'cdash-report-urls'
06661b1e4c gitlab-ci: pull annotations for CDash from the jobs
a518e402c5 ci: generate annotation reports

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8939
2023-11-03 10:38:48 -04:00
Brad King 1e7489e3ac Merge topic 'cdash-report-urls' into release-3.28
06661b1e4c gitlab-ci: pull annotations for CDash from the jobs
a518e402c5 ci: generate annotation reports

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8939
2023-11-03 10:38:47 -04:00
Kyle Edwards a7276f3c29 Merge branch 'release-3.28' 2023-11-03 10:28:36 -04:00
Kyle Edwards cee364e77f Merge topic 'cmsystemtools-runsinglecommand-stdin'
c4be9c914b cmSystemTools::RunSingleCommand(): Pass stdin to child process

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8941
2023-11-03 10:28:36 -04:00
Kyle Edwards 86ae23b6f3 Merge topic 'cmsystemtools-runsinglecommand-stdin' into release-3.28
c4be9c914b cmSystemTools::RunSingleCommand(): Pass stdin to child process

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8941
2023-11-03 10:28:35 -04:00
權少 c5388bd320 CMakeFindPackageMode: Link to cmake --find-package documentation 2023-11-03 10:17:38 -04:00
Kyle Edwards ab72846794 cmake -E cat: Add ability to print standard input 2023-11-03 09:03:25 -04:00
Kitware Robot 6b28b1b933 CMake Nightly Date Stamp 2023-11-03 00:01:09 -04:00
Ben Boeckel 06661b1e4c gitlab-ci: pull annotations for CDash from the jobs
Only move `cdash-build-id` between stages that make sense.
2023-11-02 15:24:45 -04:00
Ben Boeckel a518e402c5 ci: generate annotation reports
These will render links in the sidebar for each job.

See: https://docs.gitlab.com/ee/ci/yaml/artifacts_reports.html#artifactsreportsannotations
2023-11-02 15:24:45 -04:00
Kyle Edwards c4be9c914b cmSystemTools::RunSingleCommand(): Pass stdin to child process
Fixes: #25383
2023-11-02 10:04:00 -04:00
Brad King 1233f2d57a Merge branch 'release-3.28' 2023-11-02 09:35:57 -04:00
Brad King 3a926cba6c Merge topic 'cuda-vs'
f0feefceb3 Merge branch 'backport-cuda-vs' into cuda-vs
79f3f29e50 CUDA: Parse NVCC implicit compile/link information in Visual Studio generators
27e64a8498 CMakeNVCCParseImplicitInfo: Recognize link.exe line in CUDA VS integration
677992d85a CMakeParseImplicitLinkInfo: Log exclusion of MSVC link /implib: flag
045399a461 CMakeParseImplicitLinkInfo: Ignore MSVC link /implib: flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !8938
2023-11-02 09:35:57 -04:00
Brad King ae84de5a0c Merge topic 'cuda-vs' into release-3.28
79f3f29e50 CUDA: Parse NVCC implicit compile/link information in Visual Studio generators
27e64a8498 CMakeNVCCParseImplicitInfo: Recognize link.exe line in CUDA VS integration
045399a461 CMakeParseImplicitLinkInfo: Ignore MSVC link /implib: flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !8938
2023-11-02 09:35:56 -04:00
Brad King 0f02655bb0 Merge topic 'if-check-file-permissions'
337bc5662c if(): add operators IS_READABLE, IS_WRITABLE and IS_EXECUTABLE.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8908
2023-11-02 09:31:01 -04:00
Brad King 83a85264b4 Merge topic 'Genex-LINK_LIBRARY-updates'
1b8ceaef85 Genex LINK_LIBRARY: fix some definitions for Apple platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8936
2023-11-02 09:21:10 -04:00
Brad King d63dbb21f0 Merge topic 'findwxwidgets-lexilla'
90b77e3783 FindwxWidgets: link with lexilla
f8831a0c9e FindwxWidgets: Convert include and library paths to cmake-style
d76242ed9f FindwxWidgets: Prevent searching libraries multiple times
55072adf16 FindwxWidgets: Improve linking with scintilla
c5e3d12213 FindwxWidgets: Move wx-config specific checks inside UNIX find-style
625023cace FindwxWidgets: Include hotfix number
35d90784e9 FindwxWidgets: use IN_LIST

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8927
2023-11-02 09:19:40 -04:00
Kitware Robot 4d7342512c CMake Nightly Date Stamp 2023-11-02 00:01:06 -04:00
Ben Boeckel bb7a0497ef cmTransformDepfile: warn when a depfile is not written to 2023-11-01 14:08:18 -04:00
Ben Boeckel c22c473bde Tests/Ninja*/CustomCommandDepfile: check that deps are in the database 2023-11-01 14:08:18 -04:00
Ben Boeckel b0177003e1 cmGlobalNinjaGenerator: tell ninja to actually read the depfile
But only do so if the depfile is not specified as an output of the
command. Otherwise the command will out-of-date itself as `ninja`
deletes depfiles that it incorporates into the database and a missing
output will cause the command to run again.
2023-11-01 14:08:18 -04:00
Brad King f0feefceb3 Merge branch 'backport-cuda-vs' into cuda-vs 2023-11-01 13:51:51 -04:00
Brad King 79f3f29e50 CUDA: Parse NVCC implicit compile/link information in Visual Studio generators
Refactoring in commit deff0e638d (CUDA: Factor out helper to parse NVCC
implicit compiler and linker flags, 2023-09-15, v3.28.0-rc1~63^2~6)
incorrectly dropped detection of the default CUDA architecture and
the CUDA toolkit include directories from the code path used for
Visual Studio generators.  However, CMakeNVCCParseImplicitInfo is
now general enough that we no longer need a VS-specific code path.

Fixes: #25378
2023-11-01 13:51:21 -04:00
Brad King 27e64a8498 CMakeNVCCParseImplicitInfo: Recognize link.exe line in CUDA VS integration 2023-11-01 13:51:10 -04:00
Brad King 38ddd6c2ef Merge branch 'release-3.28' 2023-11-01 13:48:15 -04:00
Brad King 2e16fca2be Merge topic 'cxxmodules-cmp0155-graceful-fallback-without-scanner'
1f507580a1 cmGlobalGenerator: give context about module queries
889aa0354a CMP0155: ignore scanning for sources if no scanner is available

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8925
2023-11-01 13:48:15 -04:00
Brad King 59c3ce4c83 Merge topic 'cxxmodules-cmp0155-graceful-fallback-without-scanner' into release-3.28
1f507580a1 cmGlobalGenerator: give context about module queries
889aa0354a CMP0155: ignore scanning for sources if no scanner is available

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8925
2023-11-01 13:48:14 -04:00
Brad King 677992d85a CMakeParseImplicitLinkInfo: Log exclusion of MSVC link /implib: flag 2023-11-01 13:11:14 -04:00
Brad King 045399a461 CMakeParseImplicitLinkInfo: Ignore MSVC link /implib: flag
The flag specifies the import library for the linked binary.
It is not a linked library.
2023-11-01 13:07:43 -04:00
Ben Boeckel 45eff9145e cmAddCustomCommandCommand: use cmStrCat 2023-11-01 12:53:56 -04:00
Marc Chevrier 1b8ceaef85 Genex LINK_LIBRARY: fix some definitions for Apple platforms
Some declarations were inconsistent.
For example, "LINKER:-force_load <LIBRARY>" was translated to
"-Xlinker -force_load /path/to/library". The correct translation
should be "-Xlinker -force_load -Xlinker /path/to/library" because
the library is an argument to the -force_load option.
2023-11-01 17:11:37 +01:00