summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Tests: Add support for testing Qt6Craig Scott2021-10-0478-166/+272
| | | | | | | | | | | | The minimum CMake version for Qt6 is 3.16, so all the calls to cmake_minimum_required() are updated here to enforce that minimum. This will avoid any CMake version-related warnings from Qt. Avoid hard-coding Qt5 where the tests could now be using Qt5 or Qt6. Fixes: #22188
* CMake Nightly Date StampKitware Robot2021-10-011-1/+1
|
* Merge topic 'FindMatlab-version-selection'Brad King2021-09-301-0/+23
|\ | | | | | | | | | | | | 7fdd5128b1 FindMatlab: Fix version selection if a version is given Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6300
| * FindMatlab: Fix version selection if a version is givenAlexander Neumann2021-09-291-0/+23
| | | | | | | | Fixes: #22377
* | Merge topic 'cmake_find_library_suffixes_ext_windows_fixes'Brad King2021-09-301-2/+5
|\ \ | | | | | | | | | | | | | | | | | | 9aba0ce29d Help: Fix CMAKE_FIND_LIBRARY_SUFFIXES examples for Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6569
| * | Help: Fix CMAKE_FIND_LIBRARY_SUFFIXES examples for WindowsRalf Habacker2021-09-291-2/+5
| | | | | | | | | | | | Fixes: #22697
* | | Merge topic 'libuv-openbsd'Brad King2021-09-301-2/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 096450f808 libuv: Include BSD sys/cpuset.h only on platforms where we use it Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6570
| * | | libuv: Include BSD sys/cpuset.h only on platforms where we use itBrad King2021-09-291-2/+5
| | |/ | |/| | | | | | | | | | | | | Since commit 43d6e5a71f (libuv: misc: add function to get CPU affinity mask size, 2017-09-06, v3.12.0-rc1~412^2~3) we include `<sys/cpuset.h>` on several BSD platforms but only use it on FreeBSD.
* | | CMake Nightly Date StampKitware Robot2021-09-301-1/+1
| | |
* | | Merge topic 'update-third-party'Brad King2021-09-291-4/+38
|\ \ \ | |/ / |/| | | | | | | | | | | | | | ae53a3071b update-third-party: update from upstream Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6571
| * | update-third-party: update from upstreamBrad King2021-09-291-4/+38
|/ / | | | | | | | | | | Update to `update-common.sh` from commit `7134d5ebef` in https://gitlab.kitware.com/utils/git-import-third-party
* | Merge topic 'clang-warnings'Brad King2021-09-2940-44/+97
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 37859e3244 Source: Fix clang -Wimplicit-fallthrough warnings 907d098838 Source: Fix clang -Wextra-semi warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6561
| * | Source: Fix clang -Wimplicit-fallthrough warningsSean McBride2021-09-2827-22/+67
| | |
| * | Source: Fix clang -Wextra-semi warningsSean McBride2021-09-2814-22/+30
| | |
* | | Merge topic 'xcode-dead-code'Brad King2021-09-291-3/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b8a2ce0484 cmGlobalXCodeGenerator: Remove dead buildsystem version check Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !6568
| * | | cmGlobalXCodeGenerator: Remove dead buildsystem version checkBrad King2021-09-281-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 8d5f4c4db9 (Xcode: Switch to the "new build system" for Xcode 12 and above, 2020-09-14, v3.19.0-rc1~143^2~7) we accidentally added code in an `else` block that under the opposite condition by which the block can be entered. Remove it. Fixes: #22681
* | | | Merge topic 'xcode-generation-support-inl-files'Brad King2021-09-291-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 16ea0e57f7 Xcode: Treat .inl files as C++ header files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6563
| * | | | Xcode: Treat .inl files as C++ header filesJake Turner2021-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Generate the `explicitFileType` as `sourcecode.cpp.h` instead of just `sourcecode`. This enables syntax highlighting in Xcode.
* | | | | Merge topic 'GetPrerequisites-objdump-exe'Brad King2021-09-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 403f343082 GetPrerequisites: Support CMAKE_OBJDUMP with .exe extension Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6566
| * | | | | GetPrerequisites: Support CMAKE_OBJDUMP with .exe extensionDaniel Schlegel2021-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running `fixup_bundle` in a MSYS environment it fails because `gp_tool` resolves to `objdump.exe` and not just `objdump`. Fixes: #22381
* | | | | | Merge topic 'nasm-defines-fix'Brad King2021-09-291-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b94f95bed ASM_NASM: Pass preprocessor definitions to assembler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6567
| * | | | | ASM_NASM: Pass preprocessor definitions to assemblerWirtos_new2021-09-281-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Add the `<DEFINES>` placeholder to `CMAKE_ASM_NASM_COMPILE_OBJECT`. Fixes: #22694
* | | | | CMake Nightly Date StampKitware Robot2021-09-291-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'tutorial_update_step_8'Brad King2021-09-282-3/+24
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | f55a02a26e Tutorial: Enhance CTestConfig info in Step 8 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6565
| * | | Tutorial: Enhance CTestConfig info in Step 8Joseph Snyder2021-09-272-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a copy of the CTestConfig.cmake from Step 9 into the directory for Step 8. Expand the information about the contents of the CTestConfig file and write a brief explanation of where on CDash to acquire the CTestConfig file for a specific project. CMake Issue: #22663
* | | | CMake Nightly Date StampKitware Robot2021-09-281-1/+1
| | | |
* | | | Merge branch 'release-3.21'Brad King2021-09-270-0/+0
|\ \ \ \
| * \ \ \ Merge topic 'autogen-dep-on-imported-implib-only-target' into release-3.21Brad King2021-09-276-1/+85
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 895fa3433f cmQtAutoGenInitializer: support IMPLIB-only imported targets 354c1f5628 Tests/RunCMake/Autogen: test CMP0111 behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6558
* | \ \ \ \ Merge topic 'autogen-dep-on-imported-implib-only-target'Brad King2021-09-276-1/+85
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 895fa3433f cmQtAutoGenInitializer: support IMPLIB-only imported targets 354c1f5628 Tests/RunCMake/Autogen: test CMP0111 behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6558
| * | | | | cmQtAutoGenInitializer: support IMPLIB-only imported targetsBen Boeckel2021-09-241-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using the target name directly (which ends up in the `Ninja` generators querying for the `LOCATION` parameter), wrap up the target name in a `$<TARGET_LINKER_FILE:>` to avoid the query for the unset property.
| * | | | | Tests/RunCMake/Autogen: test CMP0111 behaviorBen Boeckel2021-09-245-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows, imported shared libraries which only have an `IMPORTED_IMPLIB` set fail if they are depended upon by a target using automoc. Add a test for the behavior of depending upon all imported target types from an automoc-using target.
* | | | | | Merge topic 'update-curl'Brad King2021-09-2710-48/+66
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b117bddd0 Merge branch 'upstream-curl' into update-curl c4f76b28dc curl 2021-09-22 (c7aef0a9) 71ea2d607d curl: Update script to get curl 7.79.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6560
| * \ \ \ \ \ Merge branch 'upstream-curl' into update-curlBrad King2021-09-249-47/+65
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2021-09-22 (c7aef0a9)
| | * | | | | | curl 2021-09-22 (c7aef0a9)Curl Upstream2021-09-249-47/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit c7aef0a945f9b6fb6d3f91716a21dfe2f4ea635f (curl-7_79_1).
| * | | | | | | curl: Update script to get curl 7.79.1Brad King2021-09-241-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge topic 'tutorial_update_stage_2'Brad King2021-09-271-2/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 68e0f72744 Tutorial: Describe placement of add_subdirectory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6559
| * | | | | | | Tutorial: Describe placement of add_subdirectoryJoseph Snyder2021-09-241-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that the process of making a target optional in the second step of the tutorial is further steps to the work done before, not a separate addition to the file. Do this by ensuring that the paragraph which describes the work done mentions the placement and use of the previous command. This is done to avoid duplication of the add_subdirectory call. CMake Issue: #22663
* | | | | | | | Merge topic 'iar-lang-spec-detection'Brad King2021-09-274-110/+76
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9073db736 IAR: update language specification detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6458
| * | | | | | | IAR: update language specification detectionFelipe Torrezan2021-09-234-110/+76
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2021-09-271-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2021-09-261-1/+1
| | | | | | |
* | | | | | | Merge topic 'doc-find_package-restructure'Craig Scott2021-09-251-176/+231
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84e02be51c Help: Restructure the find_package() docs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !6542
| * | | | | | | Help: Restructure the find_package() docsCraig Scott2021-09-231-176/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The explanation of the basic and full signatures was interwoven tightly with that of the Module and Config search modes. Config mode is supported by both signatures, which made the structure of the command documentation a bit confusing. Add a section at the start which unambiguously describes the two modes, including the fallback functionality between them. Move the text about this out of the basic signature section, leaving just a description of the basic syntax with a note that it is supported by both search modes. This makes the basic signature section more focused. Drop the Module and Config mode parts of the titles for the basic and full signature sections. Those are now more precisely covered by the new opening section, so the Basic Signature and Full Signature sections are now clearer in what they cover. Swap the order of the Search Procedure and Version Selection sections to improve the logical flow. Also add "Config Mode" to their titles to make it clearer what they apply to. Add a note at the start of both sections to highlight their relationship to the basic and full signatures.
* | | | | | | | CMake Nightly Date StampKitware Robot2021-09-251-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge topic 'irsl-intel-variants'Brad King2021-09-241-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 956160bb9a IRSL: Fix search for Windows redist files with Intel Classic compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6557
| * | | | | | | IRSL: Fix search for Windows redist files with Intel Classic compilerBrad King2021-09-231-0/+4
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The oneAPI icx/ifx compilers are under `.../windows/bin`. The classic icl/ifort compilers are under `.../windows/bin/intel64`. Add paths to the redist directory relative to both locations. Fixes: #22673
* | | | | | | Merge topic 'mpi-cross'Brad King2021-09-241-1/+35
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0723b2c935 MPI: Add fallback detection code for MPI when cross compiling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6537
| * | | | | | | MPI: Add fallback detection code for MPI when cross compilingHelmut Grohne2021-09-171-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MPI libraries use a compiler wrapper to automatically inject required flags and libraries into the compiler argument list. However, the wrapper does not support cross-compiling: the wrapper will try to invoke the native compiler which cannot handle the cross architecture MPI libraries and fail. This MR adds some fallback code for this case, which tries to bypass the faulty wrapper and determine the necessary flags and libraries directly from the MPI pkg-config files. The patch tries to be as unintrusive as possible and should not break any existing use-cases. Fixes: #22650
* | | | | | | | Merge branch 'release-3.21'Brad King2021-09-240-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge topic 'FindMatlab-r2021b' into release-3.21Brad King2021-09-241-0/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a013404f43 FindMatlab: Add R2021b => 9.11 version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6556
generated by cgit v0.12 at 2024-09-22 19:27:51 (GMT)