summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CompilerId/Features: Tolerate variables named for languagesBrad King2021-05-035-4/+14
| | | | | | | | | | | If a `CMakeLists.txt` or `CMAKE_TOOLCHAIN_FILE` sets a variable named `C`, `CXX`, or `CUDA`, we were previously comparing each enabled language name to the value of that variable, rather than the name itself. Double-quote the string to take advantage of policy `CMP0054`, but also add "x" prefixes to support projects that do not set the policy. Fixes: #22125
* Merge topic 'ctest_test_measurements_docs'Brad King2021-04-285-2/+119
|\ | | | | | | | | | | | | | | | | | | b60789a758 Help: Document CTest custom test measurements 63b5ddcce2 Tests: Add cases for CTest extra measurements from tests 52eac4573d Help: Fix link to cdash.org from CTest manual Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Zack Galbreath <zack.galbreath@kitware.com> Merge-request: !6029
| * Help: Document CTest custom test measurementsZack Galbreath2021-04-272-0/+82
| |
| * Tests: Add cases for CTest extra measurements from testsZack Galbreath2021-04-273-1/+36
| |
| * Help: Fix link to cdash.org from CTest manualZack Galbreath2021-04-271-1/+1
| |
* | Merge topic 'cpack-nsis-uninstall-name'Brad King2021-04-281-2/+2
|\ \ | | | | | | | | | | | | | | | | | | 79f48da5c2 CPack/NSIS: Fix CPACK_NSIS_UNINSTALL_NAME when not Uninstall.exe Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6050
| * | CPack/NSIS: Fix CPACK_NSIS_UNINSTALL_NAME when not Uninstall.exeMarkus Israelsson2021-04-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | If a previous installation was detected by the NSIS script the uninstaller was not correctly run unless it was still named `Uninstall.exe`. This meant that using `CPACK_NSIS_UNINSTALL_NAME` was simply broken. Fixes: #22103
* | | Merge topic 'ARMClang-cpu-arch-flags'Brad King2021-04-286-27/+99
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | ARMClang: Do not automatically add cpu/arch compile or link optionsLingkai Dong2021-04-276-27/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compile options `--march=<arch>` and `--mcpu=<cpu>` and the link option `--cpu=<cpu>` are automatically added by CMake based on `CMAKE_SYSTEM_PROCESSOR` or `CMAKE_SYSTEM_ARCH`. But this is not sufficient, because armclang also supports enabling or disabling features using `+<feature>`: -mcpu=<name>[+[no]<feature>+...] For example: -mcpu=cortex-a57+nocrypto+nofp+nosimd+crc (Reference: https://developer.arm.com/documentation/dui0774/k/Compiler-Command-line-Options/-mcpu?lang=en) The problem is, even if a project adds a flag with features it needs, CMake still adds flags, resulting in code that is compiled with wrong CPU features and unable to run. Add policy `CMP0123` to not automatically add compile or link options, and let projects set them instead. Co-Author: Brad King <brad.king@kitware.com> Fixes: #21173
| * | | ARMClang: Separate cpu/arch flags from preceding flagsBrad King2021-04-271-3/+3
| | | | | | | | | | | | | | | | Suggested-by: Kim Kryger
* | | | Merge topic 'doc-LINK_DEPENDS_NO_SHARED-xref'Craig Scott2021-04-281-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f2c3928cd Help: Convert CMAKE_LINK_DEPENDS_NO_SHARED to cross-reference link Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6056
| * | | | Help: Convert CMAKE_LINK_DEPENDS_NO_SHARED to cross-reference linkCraig Scott2021-04-271-2/+3
| | |_|/ | |/| |
* | | | CMake Nightly Date StampKitware Robot2021-04-281-1/+1
|/ / /
* | | Merge topic 'FindIconv-no-libc'Brad King2021-04-272-24/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 404025b00c FindIconv: Avoid explicitly finding C runtime library 8b30e7adfb FindIntl: Use explicit find_library signature NAMES keyword Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com> Merge-request: !6046
| * | | FindIconv: Avoid explicitly finding C runtime libraryBrad King2021-04-261-23/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If `iconv` functionality is built into the C runtime library, we do not need to link any libraries. Do not find `libc`. Fixes: #22114
| * | | FindIntl: Use explicit find_library signature NAMES keywordBrad King2021-04-261-1/+3
| | | |
* | | | Merge topic 'ctest_junit'Brad King2021-04-2718-6/+271
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25bf514447 ctest: Add support for writing test results in JUnit XML format Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Zack Galbreath <zack.galbreath@kitware.com> Acked-by: Michael Hirsch <michael@scivision.dev> Acked-by: MvdHurk <maikelvandenhurk@hotmail.com> Acked-by: Alexander Richardson <arichardson.kde@gmail.com> Merge-request: !6020
| * | | | ctest: Add support for writing test results in JUnit XML formatZack Galbreath2021-04-2618-6/+271
| | |_|/ | |/| | | | | | | | | | Addresses #18654
* | | | Merge topic 'update-kwsys'Brad King2021-04-271-2/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e57c4116ac Merge branch 'upstream-KWSys' into update-kwsys 1ba07ff0f8 KWSys 2021-04-26 (642ddfcc) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6047
| * \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2021-04-261-2/+19
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2021-04-26 (642ddfcc)
| | * | | KWSys 2021-04-26 (642ddfcc)KWSys Upstream2021-04-261-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 642ddfccfea808632f8d4b3be03971903e3d359d (master). Upstream Shortlog ----------------- Rolf Eike Beer (1): 7b0f5c20 SystemInformation: improve CPU counting on non-standard architectures
* | | | | Merge topic 'revert-vs-asan'Brad King2021-04-271-7/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7fce2d372e VS: Revert "Add support for ASAN -fsanitize=address flag" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6048
| * | | | | VS: Revert "Add support for ASAN -fsanitize=address flag"Brad King2021-04-261-7/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 1b37305b0f (VS: Add support for ASAN -fsanitize=address flag, 2021-04-21). The tag `EnableASAN` is created in `ItemDefinitionGroup` but it needs to be in `PropertyGroup`. Revert the mapping pending an implementation in the generator. Issue: #21081
* | | | | Merge topic 'msys-simple'Brad King2021-04-2763-67/+259
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 231df230d5 Help: Add release note for MSYS runtime support ddcd1469e8 MSYS: Add support for running under MSYS runtime environment b3ca4f9ad1 cm/filesystem: Work around crash when compiled for CYGWIN/MSYS runtime c9aec3d4a9 FindCurses: Do not assume ncurses is installed on CYGWIN Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5969
| * | | | | Help: Add release note for MSYS runtime supportBrad King2021-04-261-0/+4
| | | | | |
| * | | | | MSYS: Add support for running under MSYS runtime environmentOrgad Shaneh2021-04-2660-66/+246
| | | | | | | | | | | | | | | | | | | | | | | | Detect MSYS as CYGWIN, with the required adaptations.
| * | | | | cm/filesystem: Work around crash when compiled for CYGWIN/MSYS runtimeBrad King2021-04-261-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Issue: #22090
| * | | | | FindCurses: Do not assume ncurses is installed on CYGWINBrad King2021-04-261-1/+1
| |/ / / /
* | | | | CMake Nightly Date StampKitware Robot2021-04-271-1/+1
|/ / / /
* | | | Merge topic 'SWIG'Brad King2021-04-263-8/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e3e005dbd8 UseSWIG: use swig dependencies for Xcode generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6042
| * | | | UseSWIG: use swig dependencies for Xcode generatorMarc Chevrier2021-04-233-8/+24
| | | | |
* | | | | Merge topic 'xcode_app_extensions'Brad King2021-04-2623-67/+274
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb5e33ba47 Xcode: Add support for embedding app extensions f62a2bf44f Tests: Factor out XcodeProject-Embed check function findAttribute() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5934
| * | | | | Xcode: Add support for embedding app extensionsAlexander Akhundzhanov2021-04-2219-28/+246
| | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Craig Scott <craig.scott@crascit.com>
| * | | | | Tests: Factor out XcodeProject-Embed check function findAttribute()Craig Scott2021-04-114-39/+28
| | | | | |
* | | | | | Merge topic 'lzma-threads'Brad King2021-04-2666-336/+1296
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c5c130e675 cmArchiveWrite: Consolidate multiple ways to set thread count 5380d858ff liblzma: Enable multi threaded stream encoding support e9065e96dc Merge branch 'upstream-liblzma' into lzma-threads ee909a8e8b liblzma 2020-03-17 (2327a461) 741b85b42b liblzma: Revise update script to get version 5.2.5 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6014
| * | | | | | cmArchiveWrite: Consolidate multiple ways to set thread countNils Gladitz2021-04-227-61/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge use of SetFilterOption() into more abstract thread count in cmArchiveWrite constructor. libarchive defaulting of threads for threads == 0 seems to be configuration dependent. Preemptively default thread count via std::thread::hardware_concurrency(). Also allow negative values for the thread count in which case the detected hardware concurrency is also used but the given absolute thread count is used as an upper limit.
| * | | | | | liblzma: Enable multi threaded stream encoding supportNils Gladitz2021-04-226-6/+29
| | | | | | |
| * | | | | | Merge branch 'upstream-liblzma' into lzma-threadsBrad King2021-04-2253-268/+1205
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-liblzma: liblzma 2020-03-17 (2327a461)
| | * | | | | | liblzma 2020-03-17 (2327a461)liblzma upstream2021-04-2254-273/+1216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://git.tukaani.org/xz.git at commit 2327a461e1afce862c22269b80d3517801103c1b (v5.2.5).
| * | | | | | | liblzma: Revise update script to get version 5.2.5Nils Gladitz2021-04-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep files related to multi threaded stream encoding.
* | | | | | | | Merge topic 'autogen-moc-version'Brad King2021-04-266-5/+114
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b0ea5874a AutoGen: Retrieve Qt version from moc as fallback Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6027
| * | | | | | | | AutoGen: Retrieve Qt version from moc as fallbackJoerg Bornemann2021-04-236-5/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consider the case where the find_package call for QtCore is wrapped in a function call. Then AutoGen cannot determine the Qt version, because it only looks at variables and directory properties. The former don't leave the function scope and the latter are not set by default. As a fallback, locate the moc executable via its target and call it with the --version argument to determine the Qt version. Issue: #22028
* | | | | | | | | Merge topic 'file-REAL_PATH-EXPAND_TILDE'Brad King2021-04-266-21/+77
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e4b793c614 file(REAL_PATH): add option EXPAND_TILDE Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Michael Hirsch <michael@scivision.dev> Merge-request: !6033
| * | | | | | | | | file(REAL_PATH): add option EXPAND_TILDEMarc Chevrier2021-04-216-21/+77
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option enables the replacement of any leading tilde with the path to the user's home directory.
* | | | | | | | | Merge branch 'release-3.20'Brad King2021-04-260-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge topic 'doc-compile-features-wcdh' into release-3.20Brad King2021-04-262-115/+142
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f4ec3f4a7 Help: Do not recommend WCDH in cmake-compile-features(7) 1cc63f2cd5 Help: Fix typos in cmake-compile-features(7) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6037
* | \ \ \ \ \ \ \ \ \ Merge topic 'doc-compile-features-wcdh'Brad King2021-04-262-115/+142
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f4ec3f4a7 Help: Do not recommend WCDH in cmake-compile-features(7) 1cc63f2cd5 Help: Fix typos in cmake-compile-features(7) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6037
| * | | | | | | | | | Help: Do not recommend WCDH in cmake-compile-features(7)Brad King2021-04-232-114/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit da7ad7997e (WriteCompilerDetectionHeader: Add policy to remove module, 2020-12-04, v3.20.0-rc1~350^2), the WCDH module is deprecated. Update the `cmake-compile-features(7)` manual section that previously recommended WCDH to make such detection the project's responsibility instead. Move the old content of the section over to the WCDH module to preserve it.
| * | | | | | | | | | Help: Fix typos in cmake-compile-features(7)Brad King2021-04-231-6/+6
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'release-3.20'Brad King2021-04-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |