summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'doc-improvements'Brad King2022-11-108-22/+20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | d4d1f85297 Help: Move a note about arguments and genexes into include file 968224484f Help: Drop unused `PROPERTY_GENEX` replace from `prop_tgt/INTERFACE_*` files 65457e4fae Help: Add _See Also_ sections to related CMake commands c86ec79d07 Help: Use direct refs to genexes instead of ``$<GENEX-NAME>`` 8c6274326d Help: Use CMake highlighting for command synopsis c356a94512 Help: Use monospaced font for a genex name in a section title f98c8707f4 Help: Use `code-block:: cmake` instead of `::` for sub-commands descriptions 2ba351ca4f Help: ``CMake`` → CMake ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7873
| * Help: ``CMake`` → CMakeAlex Turbov2022-11-074-7/+7
| |
| * Help: Use captions for code snippets in the `FetchContent` moduleAlex Turbov2022-11-071-6/+4
| | | | | | | | | | Instead of "manually" added captions use the Sphinx option of `code-block` directive.
| * Help: Use role `:program:`Alex Turbov2022-11-064-9/+9
| | | | | | | | | | When mention execitable names use Sphinx semantic role `:program` instead of ``executable`` or **executable**.
* | Merge topic 'find_cuda_toolkit_support_symlink_math_dirs'Brad King2022-11-101-2/+2
|\ \ | | | | | | | | | | | | | | | | | | 6f707ab541 FindCUDAToolkit: Support math_libs directory being a symlink Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7893
| * | FindCUDAToolkit: Support math_libs directory being a symlinkRobert Maynard2022-11-091-2/+2
| | | | | | | | | | | | Fixes #24140
* | | ASM_MARMASM: Add support for Microsoft ARM assembler languageIlia K2022-11-093-0/+51
|/ / | | | | | | | | | | https://learn.microsoft.com/en-us/cpp/assembler/arm/arm-assembler-reference Fixes: #23999
* | Merge topic 'googletest-addtests-skipped'Brad King2022-11-081-0/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | f54963e60f GoogleTest: Reports skipped test with gtest_add_tests Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7868
| * | GoogleTest: Reports skipped test with gtest_add_testsDavidPerretSN2022-11-071-0/+6
| | | | | | | | | | | | | | | | | | Skipped GTests were reported as success when tests where added with gtest_add_tests. This fixes this behaviour. Fixes: #24130
* | | Merge topic 'find-version-vars'Brad King2022-11-083-24/+81
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e3f1723ff Find{BZip2,LibLZMA,ZLIB}: use *_VERSION as modern CMake Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Craig Scott <craig.scott@crascit.com> Merge-request: !7877
| * | | Find{BZip2,LibLZMA,ZLIB}: use *_VERSION as modern CMakeMichael Hirsch2022-11-073-24/+81
| | |/ | |/| | | | | | | The old *_VERSION_STRING is silently left set for backward compat.
* | | Merge topic 'sphinx-linkcheck'Brad King2022-11-0817-32/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a89c76a773 Build: Add `SPHINX_LINKCHECK` build option 137b00cda1 Build: Do not redirect `sphinx-build` output if CMake running in verbose mode d954fb8a60 Build: Deduplicate `add_custom_command()` calls for Sphinx targets 2af8724485 Merge branch 'backport-sphinx-linkcheck' into sphinx-linkcheck 435b0c573c Help: Fix some redirects reported with sphinx linkcheck ac5295a9de Help: Fix broken external links found by sphinx linkcheck Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7876
| * \ \ Merge branch 'backport-sphinx-linkcheck' into sphinx-linkcheckBrad King2022-11-0717-32/+32
| |\ \ \ | | |/ / | |/| |
| | * | Help: Fix some redirects reported with sphinx linkcheckAlex Turbov2022-11-0714-28/+29
| | | | | | | | | | | | | | | | Mostly it's about replace `http:` with `https:` protocol.
| | * | Help: Fix broken external links found by sphinx linkcheckAlex Turbov2022-11-073-4/+3
| | | |
* | | | Merge topic 'FindOpenSSL-mingw-lib64'Brad King2022-11-081-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed24414eee FindOpenSSL: Search "lib64" for mingw 64-bit installs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7875
| * | | | FindOpenSSL: Search "lib64" for mingw 64-bit installsklytje2022-11-071-0/+2
| | |/ / | |/| |
* | | | Merge topic 'tasking_remove_system_processor'Brad King2022-11-081-32/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0a1d558971 Tasking: Remove CMAKE_SYSTEM_PROCESSOR support per CMP0123 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7879
| * | | | Tasking: Remove CMAKE_SYSTEM_PROCESSOR support per CMP0123Christoph Seitz2022-11-071-32/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Architecture specific compile options should be set through toolchain files. Fixes: #24115
| * | | Merge topic 'tasking-pic' into release-3.25Brad King2022-11-041-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e612977b9 Tasking: Fix PIC option for Tasking Toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Christoph Seitz <christoph.seitz@posteo.de> Merge-request: !7862
| * \ \ \ Merge topic 'correct_nvptxcompiler_not_linking_to_threads' into release-3.25Brad King2022-11-031-2/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62f13ed588 FindCUDAToolkit: Restore usage from multiple directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7859
* | \ \ \ \ Merge topic 'ExternalProject-INSTALL_BYPRODUCTS'Brad King2022-11-071-4/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c6b2928f4 ExternalProject: Add `INSTALL_BYPRODUCTS` option 6d6baffb85 Tests: Fix ExternalLibraryWithSubstitution test 4bcfff2df3 ExternalProject: Clarify `BYPRODUCTS` docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7866
| * | | | | | ExternalProject: Add `INSTALL_BYPRODUCTS` optionAlois Klink2022-11-051-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an `INSTALL_BYPRODUCTS` option to `ExternalProject_Add` that can be used to declare that files are `BYPRODUCTS` of the ExternalProject install step. This is often required by the Ninja generator to explicitly declare dependencies. Previously, many users used `BUILD_BYPRODUCTS`, even if their files were created by the install step, not the build step. This commit essentially just copies the code for `BUILD_BYPRODUCTS`. Fixes: #24120 Fixes: #23056
| * | | | | | ExternalProject: Clarify `BYPRODUCTS` docsAlois Klink2022-11-031-4/+10
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that the `BUILD_BYPRODUCTS` and `BYPRODUCTS` options in ExternalProject may also be required when using the Ninja generator (as that's one of the primary reasons why you'd want to use those options). I've also mentioned that `add_custom_command` has additional documentation on what `BYPRODUCTS` does.
* | | | | | Merge topic 'CheckCompilerFlag-Swift'Brad King2022-11-071-0/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2d5403ecaa CheckCompilerFlag: Add Swift Support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7865
| * | | | | CheckCompilerFlag: Add Swift SupportEvan Wilde2022-11-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plumb through Swift `check_compiler_flag` support. Add tests to check that valid flags work and invalid flags don't.
* | | | | | Merge topic 'tasking-pic'Brad King2022-11-041-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | 7e612977b9 Tasking: Fix PIC option for Tasking Toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Christoph Seitz <christoph.seitz@posteo.de> Merge-request: !7862
| * | | | Tasking: Fix PIC option for Tasking ToolsetGordon Jess2022-11-031-1/+1
| | |/ / | |/| | | | | | | | | | Fixes: #24114
* | | | Merge topic 'correct_nvptxcompiler_not_linking_to_threads'Brad King2022-11-031-2/+4
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 62f13ed588 FindCUDAToolkit: Restore usage from multiple directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7859
| * | | FindCUDAToolkit: Restore usage from multiple directoriesRobert Maynard2022-11-021-2/+4
| | | | | | | | | | | | | | | | Fixes #24119
* | | | Merge topic 'IAR-CXX-fix'Brad King2022-11-021-2/+2
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | | | | | | 73e84a392b IAR: Restore support for CMAKE_CXX_FLAGS_INIT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7857
| * | IAR: Restore support for CMAKE_CXX_FLAGS_INITDaniel Schürmann2022-11-011-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | Prior to commit a9073db736 (IAR: update language specification detection, 2021-09-23, v3.22.0-rc1~83^2) the `--c++`/`--eec++` flags were stored in `CMAKE_IAR_CXX_FLAG` so that they would be used as part of the `CMAKE_CXX_COMPILE_OBJECT` rule variable. That commit moved the flags to `CMAKE_CXX_FLAGS`, which also broke initialization of `CMAKE_CXX_FLAGS` from `CMAKE_CXX_FLAGS_INIT`. Restore the original approach. Fixes: #24111
* | Merge topic 'FindCUDAToolkit-nvptxcompiler-static-deps'Brad King2022-11-011-1/+2
|\ \ | |/ | | | | | | | | | | 301815eb62 FindCUDAToolkit: Add nvptxcompiler_static dependency on Threads::Threads Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7853
| * FindCUDAToolkit: Add nvptxcompiler_static dependency on Threads::ThreadsRobert Maynard2022-10-311-1/+2
| |
| * Merge topic 'ArchLinux-lib-dir' into release-3.25Brad King2022-10-311-3/+8
| |\ | | | | | | | | | | | | | | | | | | | | | 988b9928e4 Linux: Avoid finding libraries using lib64 on ArchLinux Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Felix Yan <felixonmars@archlinux.org> Merge-request: !7849
* | \ Merge topic 'ewilde/swift-output-file-map-logic'Brad King2022-10-311-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e88509d0e8 Swift: Omit output-file-map when used as a linker Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7835
| * | | Swift: Omit output-file-map when used as a linkerEvan Wilde2022-10-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Swift is used as the linker for non-swift files because it needs to pull files like swiftrt.o in when swift symbols are present to ensure that the swift runtime is linked. The swift driver uses clang as the underlying linker, which pulls in crtbegin.o and friends when appropriate, so using Swift as a linker for C/C++ libraries is fine. The output-file-map was getting passed to all Swift invocations, regardless of whether or not we generated one. This patch changes it so that we only include the output-file-map in the Swift compiler invocation if we have actually generated the file.
* | | | Merge topic 'ArchLinux-lib-dir'Brad King2022-10-311-3/+8
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 988b9928e4 Linux: Avoid finding libraries using lib64 on ArchLinux Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Felix Yan <felixonmars@archlinux.org> Merge-request: !7849
| * | | Linux: Avoid finding libraries using lib64 on ArchLinuxLetu Ren2022-10-301-3/+8
| | | | | | | | | | | | | | | | | | | | ArchLinux uses `/lib` for 64-bit libraries and there is no `/lib64`. However, unlike Debian, 32-bit libraries are in `/lib32`.
* | | | Merge topic 'ninja-showIncludes-encoding'Brad King2022-10-311-1/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a0d4e3bf34 cmGeneratedFileStream: Drop unused WriteRaw method 2e5af30ce0 Ninja: Match showIncludes dependencies using console output code page e1c1679148 cm_codecvt: Add support for the Windows console output code page 328c15189d cmGeneratedFileStream: Add support for a temporary alternate encoding Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7845
| * | | Ninja: Match showIncludes dependencies using console output code pageBrad King2022-10-301-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Generalize the fix from commit 37a279f8d1 (Ninja: Write msvc_deps_prefix as UTF-8 when console codepage is UTF-8, 2020-07-31, v3.19.0-rc1~349^2). `cl /showIncludes` output is encoded using the console output code page, so this is the byte sequence that Ninja must use to match its lines. Fixes: #24068
* | | Merge topic 'FindGLUT-pkg-config'Brad King2022-10-281-3/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | 919ab832e8 FindGLUT: Fix regression when pkg-config is not available Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7840
| * | FindGLUT: Fix regression when pkg-config is not availableBrad King2022-10-271-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | In commit a2fc4b6257 (FindGLUT: Drop the now-unnecessary exclusion of pkg-config for multiconfig, 2022-10-13, v3.25.0-rc2~16^2) we accidentally removed the entire condition around the `pkg-config` code path instead of just the multi-config part. Fixes: #24095
| * | Merge topic 'nsis-licence-bom' into release-3.25Brad King2022-10-251-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | b276d9d8f1 CPack/NSIS: Document BOM mark for UTF-8 encoded LICENSE file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7820
| * \ \ Merge topic 'flang-windows' into release-3.25Brad King2022-10-251-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 166bc00399 LLVMFlang: Add a required line to define linking rules on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7818
* | | | | ExternalProject: Use -S and -B args to robustly set configure dirsCraig Scott2022-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the build directory was not explicitly specified. Instead, the current working directory was assumed to be the build directory and the source directory was passed as a positional argument. However, if the source directory contained a CMakeCache.txt, it was treated as a binary directory instead. For the scenario where a project is built in-source and it calls ExternalProject_Add() with its own source directory but a different build directory (e.g. to build itself with a different set of configure arguments), this results in a build error. Explicitly list both the source and build directories using the -S and -B options respectively. This unambiguously sets both, avoiding the above problem. Fixes: #24081
* | | | | Merge topic 'nsis-licence-bom'Brad King2022-10-251-1/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | b276d9d8f1 CPack/NSIS: Document BOM mark for UTF-8 encoded LICENSE file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7820
| * | | | CPack/NSIS: Document BOM mark for UTF-8 encoded LICENSE fileMojca Miklavec2022-10-241-1/+2
| |/ / / | | | | | | | | | | | | | | | | Previously this requirement was only mentioned in the 3.20 release notes.
* | | | Merge topic 'flang-windows'Brad King2022-10-251-0/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 166bc00399 LLVMFlang: Add a required line to define linking rules on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7818
| * | | LLVMFlang: Add a required line to define linking rules on Windowsمهدي شينون (Mehdi Chinoune)2022-10-241-0/+1
| | | | | | | | | | | | | | | | | | | | This was missed in commit d34e5a98b8 (LLVMFlang: Add support for Windows, 2022-09-18, v3.25.0-rc1~102^2).