summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'clang-imsvc'Brad King2021-02-102-1/+1
|\ | | | | | | | | | | | | | | 2fc5e5dba9 Clang: Use -imsvc for system include only with MSVC-like front-end Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Thomas Bernard <thomas@famillebernardgouriou.fr> Merge-request: !5792
| * Clang: Use -imsvc for system include only with MSVC-like front-endBrad King2021-02-092-1/+1
| | | | | | | | | | | | | | | | | | | | In commit bb61c2d024 (Clang: use -imsvc for system include dirs when running on Windows, 2020-09-16, v3.19.0-rc1~162^2) we added `-imsvc` for all Clang compilers targeting the MSVC ABI. However, the option only exists for the MSVC-like front-end. The GNU-like front-ends use `-isystem`. Fixes: #21789
* | Merge branch 'release-3.19'Brad King2021-02-100-0/+0
|\ \
| * \ Merge topic 'ctest-dashboard-with-modified-files' into release-3.19Brad King2021-02-101-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | 33fa015b4a CTest: Restore running dashboard client Test step with modified files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5791
* | | Merge topic 'ctest-dashboard-with-modified-files'Brad King2021-02-101-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 33fa015b4a CTest: Restore running dashboard client Test step with modified files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5791
| * | CTest: Restore running dashboard client Test step with modified filesBrad King2021-02-091-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 6a6f1d1edd (CTest: exit nonzero after message(SEND_ERROR|FATAL_ERROR), 2020-04-03, v3.19.0-rc1~260^2), `ctest` no longer runs tests if there are errors before the full set of tests is defined. Such errors were previously treated more like warnings. The change exposed some cases where we were issuing an error message but proceeding to run tests anyway. The above commit downgraded one such case (missing `DartConfiguration.tcl`) to a warning explicitly in order to restore its former warning-like semantics. Downgrade the Update step's diagnostic about modified or conflicting files to a warning for the same reason. Fixes: #21783
* | CMake Nightly Date StampKitware Robot2021-02-101-1/+1
| |
* | Merge branch 'release-3.19'Brad King2021-02-090-0/+0
|\ \ | |/
| * Merge topic 'FindXCTest-bundle-inject' into release-3.19Brad King2021-02-091-2/+9
| |\ | | | | | | | | | | | | | | | | | | eafe740ead FindXCTest: Fix output directory for test bundle with new build system Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5786
* | \ Merge topic 'FindXCTest-bundle-inject'Brad King2021-02-091-2/+9
|\ \ \ | | |/ | |/| | | | | | | | | | | | | eafe740ead FindXCTest: Fix output directory for test bundle with new build system Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5786
| * | FindXCTest: Fix output directory for test bundle with new build systemYauheni Khnykin2021-02-081-2/+9
| | | | | | | | | | | | | | | | | | | | | The output directory was still correct for macOS with the new build system, but not for iOS. Fixes: #20662
* | | Merge branch 'release-3.19'Brad King2021-02-090-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'xcode12-ios_install_combined' into release-3.19Brad King2021-02-098-21/+109
| |\ \ | | |/ | |/| | | | | | | | | | | | | 0110aa018d IOS_INSTALL_COMBINED: Support Xcode 12 (command line only) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5785
* | | Merge topic 'xcode12-ios_install_combined'Brad King2021-02-098-21/+109
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 0110aa018d IOS_INSTALL_COMBINED: Support Xcode 12 (command line only) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5785
| * | IOS_INSTALL_COMBINED: Support Xcode 12 (command line only)Craig Scott2021-02-088-21/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 12 doesn't allow nested builds within the same build directory. That means we can no longer do an install by building the install target when IOS_INSTALL_COMBINED is true. We can, however, still do an install by running the cmake_install.cmake script or executing cmake --install, since there is no outer build and therefore the associated SDK can be built as a sub-build. The non-build methods previously didn't work when IOS_INSTALL_COMBINED was true because the generated install script and the CMakeIOSInstallCombined script both made certain assumptions that relied on being part of a build. Those assumptions are now removed. A side-effect of this work is that cpack now also works from the command line when IOS_INSTALL_COMBINED is true. Relates: #21282 Fixes: #20023
* | | Merge topic 'object-lib-multiarch'Brad King2021-02-0915-26/+159
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d46b1401f add_library(): Allow imported object libraries with multi-arch 1a915e8953 Tests: TargetObjects does not need any languages enabled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5771
| * | | add_library(): Allow imported object libraries with multi-archCraig Scott2021-02-0613-21/+158
| | | | | | | | | | | | Fixes: #21276
| * | | Tests: TargetObjects does not need any languages enabledCraig Scott2021-02-052-5/+1
| | | |
* | | | Merge topic 'cuda_support_nvcc_from_hpctoolkit'Brad King2021-02-093-38/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3cef91a321 CUDA: Always extract CUDA Toolkit root from nvcc verbose output Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Tested-by: Raul Tambre <raul@tambre.ee> Merge-request: !5777
| * | | | CUDA: Always extract CUDA Toolkit root from nvcc verbose outputRobert Maynard2021-02-083-38/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #21750, #21763 Given that NVCC can be provided by multiple different sources (NVIDIA HPC SDK, CUDA Toolkit, distro) each of which has a different layout, we need to extract the CUDA toolkit root from the compiler itself, allowing us to support numerious different scattered toolkit layouts. The NVIDIA HPC SDK specifically ships two copies of nvcc one in `compilers/bin/` and one in `cuda/bin`. Thus when using `compilers/bin/nvcc` the Toolkit root logic fails.
* | | | | Merge topic '21479-branding-name-cpack-nsis'Brad King2021-02-096-0/+50
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0aabeb0c30 CPack/NSIS: Add option for setting branding text Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5784
| * | | | | CPack/NSIS: Add option for setting branding textJohnny Jazeix2021-02-076-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://nsis.sourceforge.io/Reference/BrandingText for more information. Fixes: #21479
* | | | | | Merge topic 'AddFileDependencies-deprecate'Brad King2021-02-094-17/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9cddaad940 AddFileDependencies: Deprecate this unnecessary module 4841d38a7a MacroAddFileDependencies: Explicitly deprecate by documentation 777c14af82 MacroAddFileDependencies: Simplify implementation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5788
| * | | | | | AddFileDependencies: Deprecate this unnecessary moduleBrad King2021-02-083-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Document that one can call `set_property` directly instead.
| * | | | | | MacroAddFileDependencies: Explicitly deprecate by documentationBrad King2021-02-081-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This module has been discouraged since commit 1e20be319f (STYLE: add documentation for MACRO_ADD_FILE_DEPENDENCIES(), 2009-07-14, v2.8.0~433). It has been listed in the `cmake-modules(7)` manual as deprecated since commit df780bcc01 (Help: Move deprecated modules to appropriate section., 2018-11-12, v3.14.0-rc1~374^2). Add the explicit deprecation mark in its documentation.
| * | | | | | MacroAddFileDependencies: Simplify implementationBrad King2021-02-081-8/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2021-02-091-1/+1
| | | | | | |
* | | | | | | Merge topic 'copyright-sort'Brad King2021-02-081-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 046175b35a Copyright.txt: Sort list of Contributors Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5789
| * | | | | | Copyright.txt: Sort list of ContributorsBrad King2021-02-081-1/+1
|/ / / / / /
* | | | | | Merge topic 'AddFileDependencies-simplify'Brad King2021-02-081-11/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f6fc388ea AddFileDependencies: Avoid leaking temporary variable Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5779
| * | | | | | AddFileDependencies: Avoid leaking temporary variableAnakin Skywalker2021-02-081-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert `add_file_dependencies` to a function. Simplify the implementation using `set_property` with `APPEND`.
* | | | | | | Merge topic 'cmake_library_architecture_better_multiarch_support'Brad King2021-02-0827-22/+112
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 657fc3a9a7 CMakeDetermineCompilerABI: Parse library arch from versioned paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5773
| * | | | | | | CMakeDetermineCompilerABI: Parse library arch from versioned pathsRobert Maynard2021-02-0427-22/+112
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach CMake how to extract `CMAKE_<LANG>_LIBRARY_ARCHITECTURE` from versioned paths such as `/usr/lib/gcc/x86_64-linux-gnu/9`. These kind of paths are generated by NVHPC compilers.
* | | | | | | Merge topic 'FindGit-version-optimization-more'Brad King2021-02-081-16/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c99dfd7be7 FindGit: Cache the version more effectively Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5774
| * | | | | | | FindGit: Cache the version more effectivelyCraig Scott2021-02-051-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 315a200f0c4 (FindGit: Cache the GIT_EXECUTABLE version for the current run, 2021-01-20), the GIT_VERSION_STRING was meant to be cached after the first time it was computed for a given GIT_EXECUTABLE location. That logic assumed GIT_VERSION_STRING would be visible in the current scope, but it might not be. The global property alone is enough to check whether the version has been determined previously, so don't switch the logic based on whether GIT_VERSION_STRING is defined or not. Relates: #21703
* | | | | | | | Merge topic 'doc-genex-links'Brad King2021-02-086-11/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5dd356cefc Help: Convert some genex names to explicit cross-references Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5778
| * | | | | | | | Help: Convert some genex names to explicit cross-referencesBrad King2021-02-056-11/+11
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit c2dc7e0f53 (Help: Convert genex documentation to sphinx domain objects, 2021-01-15) we can use `:genex:` cross-references to link to named generator expressions. Update some places to do this. This is meant to demonstrate the capability, not as a comprehensive sweep.
* | | | | | | | Merge topic 'parser-gcc-warning'Brad King2021-02-089-876/+884
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aac80ec1ee LexerParser: Suppress gcc -Wfree-nonheap-object warnings in generated code Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Christoph GrĂ¼ninger <foss@grueninger.de> Merge-request: !5775
| * | | | | | | | LexerParser: Suppress gcc -Wfree-nonheap-object warnings in generated codeBrad King2021-02-059-876/+884
| | | | | | | | |
* | | | | | | | | Merge branch 'release-3.18'Brad King2021-02-080-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'lexer-posix-source' into release-3.18Brad King2021-02-051-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !5776
* | \ \ \ \ \ \ \ \ \ Merge branch 'release-3.19'Brad King2021-02-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Merge topic 'lexer-posix-source' into release-3.19Brad King2021-02-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8b41e2c68 LexerParser: Do not override existing _POSIX_C_SOURCE definition 82cfeeb484 Merge branch 'backport-3.18-ci-wix-download' into release-3.18 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5776
* | | | | | | | | | Merge topic 'lexer-posix-source'Brad King2021-02-081-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | a8b41e2c68 LexerParser: Do not override existing _POSIX_C_SOURCE definition Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5776
| * | | | | | | | LexerParser: Do not override existing _POSIX_C_SOURCE definitionBrad King2021-02-051-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit f034b0f663 (CMake compilation: do not use compiler extensions, 2020-03-14, v3.18.0-rc1~494^2) we explicitly defined `_POSIX_C_SOURCE` to ensure availability of POSIX APIs even when compiler extensions are not enabled. Update the code to avoid redefining `_POSIX_C_SOURCE` if it is already defined. This occurs when building our release binaries as configured in `Utilities/Release/linux`, where we define `_POSIX_C_SOURCE` explicitly on the compiler command line.
* | | | | | | | CMake Nightly Date StampKitware Robot2021-02-081-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2021-02-071-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2021-02-061-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'fetchcontent-performance'Brad King2021-02-0536-1156/+1907
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 17e5516e60 FetchContent: Invoke steps directly and avoid a separate sub-build 4f3d1abbb4 ExternalProject: Refactor pre-configure steps to support no-target uses 23aab9ecce ExternalProject: Avoid scanning docs for keywords, use include_guard() Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robertjmaynard@gmail.com> Acked-by: Michael Hirsch, Ph.D. <michael@scivision.dev> Acked-by: Lars Melchior <lars.melchior@gmail.com> Merge-request: !5749
| * | | | | | FetchContent: Invoke steps directly and avoid a separate sub-buildCraig Scott2021-02-0416-326/+481
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cost of setting up and executing a separate sub-build to do the download, update and patch steps required for FetchContent population can be significant with some platforms and CMake generators. Avoid the sub-build altogether by invoking the step scripts directly. Previously, if no generator was set (e.g. population was being done in script mode), a generator needed to be available on the default PATH. Since we no longer use a sub-build, this restriction is also now gone. Fixes: #21703