summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.21'Brad King2021-07-200-0/+0
|\
| * Merge topic 'iar-exe-suffix' into release-3.21Brad King2021-07-204-3/+12
| |\ | | | | | | | | | | | | | | | | | | | | | 09bc0785ee Help: Document CMAKE_EXECUTABLE_SUFFIX_<LANG> explicitly 05a3bafe65 Compiler/IAR: Avoid clobbering CMAKE_EXECUTABLE_SUFFIX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6357
* | \ Merge topic 'iar-exe-suffix'Brad King2021-07-204-3/+12
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 09bc0785ee Help: Document CMAKE_EXECUTABLE_SUFFIX_<LANG> explicitly 05a3bafe65 Compiler/IAR: Avoid clobbering CMAKE_EXECUTABLE_SUFFIX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6357
| * | Help: Document CMAKE_EXECUTABLE_SUFFIX_<LANG> explicitlyLorenzo Cappelletti2021-07-203-1/+10
| | | | | | | | | | | | | | | Documentation for `CMAKE_EXECUTABLE_SUFFIX_<LANG>`, useful when cross-compiling, is buried in section `CMAKE_EXECUTABLE_SUFFIX`.
| * | Compiler/IAR: Avoid clobbering CMAKE_EXECUTABLE_SUFFIXLorenzo Cappelletti2021-07-201-2/+2
| | | | | | | | | | | | | | | | | | Use `CMAKE_EXECUTABLE_SUFFIX_<LANG>` instead. Fixes: #22426
* | | Merge branch 'release-3.21'Brad King2021-07-200-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'iar-host-exe' into release-3.21Brad King2021-07-201-8/+24
| |\ \ | | |/ | |/| | | | | | | | | | | | | 1c66012f8e Compiler/IAR: search for both IAR's binaries * and *.exe Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6362
* | | Merge topic 'iar-host-exe'Brad King2021-07-201-8/+24
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 1c66012f8e Compiler/IAR: search for both IAR's binaries * and *.exe Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6362
| * | Compiler/IAR: search for both IAR's binaries * and *.exeLorenzo Cappelletti2021-07-201-8/+24
| |/ | | | | | | | | | | | | | | | | IAR is available for both Linux and Windows OSes. Moreover, binaries `*.exe` could be called from a Linux box, or vice versa. See also commit 01a4eec446 (IAR: Changes required for Linux, 2019-04-25, v3.15.0-rc1~185^2). Fixes: #22312
* | Merge topic 'find_library_usable_from_script_mode'Brad King2021-07-206-4/+60
|\ \ | | | | | | | | | | | | | | | | | | aa3ab3eb92 find_library: Infer library prefix and suffix when in script mode Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6338
| * | find_library: Infer library prefix and suffix when in script modeRobert Maynard2021-07-196-4/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This aligns `find_library` with the documentation that states it can be called from script mode. This is done by infering the proper prefix and suffix values when `find_library` is called when the `CMAKE_FIND_LIBRARY*` are not set. This also means that `find_library` won't produce obscure error messages about unset definitions. Fixes: #22027
* | | Merge branch 'release-3.21'Brad King2021-07-200-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'enable_language-CMP0126' into release-3.21Brad King2021-07-201-4/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | f75610d492 CMakeDetermineCompilerId: Fix CMAKE_EXECUTABLE_FORMAT in CMP0126 NEW behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6364
* | \ \ Merge topic 'enable_language-CMP0126'Brad King2021-07-201-4/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | f75610d492 CMakeDetermineCompilerId: Fix CMAKE_EXECUTABLE_FORMAT in CMP0126 NEW behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6364
| * | | CMakeDetermineCompilerId: Fix CMAKE_EXECUTABLE_FORMAT in CMP0126 NEW behaviorBrad King2021-07-191-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting `CMAKE_EXECUTABLE_FORMAT` as a normal variable is unnecessary because setting it as a cache entry already makes the value visible to the calling scope. Fixes: #22433
* | | | Merge branch 'release-3.21'Brad King2021-07-200-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'autogen-ui-header-depends' into release-3.21Brad King2021-07-201-6/+14
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9cebdbec77 AUTOUIC: Fix cyclic dependency between generated UI headers and timestamp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6359
* | \ \ \ Merge topic 'autogen-ui-header-depends'Brad King2021-07-201-6/+14
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 9cebdbec77 AUTOUIC: Fix cyclic dependency between generated UI headers and timestamp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6359
| * | | | AUTOUIC: Fix cyclic dependency between generated UI headers and timestampAlexey Edelev2021-07-191-6/+14
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once the generated UI headers are created by UIC they also are involved into processing in next run on ninja. Autogen adds `ui_*.h` files to the deps file `ui_*.h` and this cause timestamp start depend on `ui_*.h`. Meanwhile `ui_*.h` depend on timestamp because of the explicit rules added by commit 1265c65b33 (AUTOUIC: Collect ui header files for Ninja generator, 2021-02-18, v3.21.0-rc1~600^2). Avoid adding `ui_*.h` to deps file at second ninja run. Fixes: #16776
* | | | Merge branch 'release-3.21'Brad King2021-07-200-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'doc-policies-3.21' into release-3.21Brad King2021-07-204-26/+54
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b5fa0f7b4 Help: Make policy CMP0126 wording more accurate c4bc250f8c Help: Explain policy CMP0125 in more detail 6d5f74fcd7 Help: Clarify wording of CMP0124 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6360
* | \ \ \ Merge topic 'doc-policies-3.21'Brad King2021-07-204-26/+54
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b5fa0f7b4 Help: Make policy CMP0126 wording more accurate c4bc250f8c Help: Explain policy CMP0125 in more detail 6d5f74fcd7 Help: Clarify wording of CMP0124 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6360
| * | | | Help: Make policy CMP0126 wording more accurate Craig Scott2021-07-172-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OLD behavior only removes a non-cache variable of the same name in specific circumstances. The previous wording implied that it would always occur. Also add a note about the behavior compared to the analogous CMP0077 policy, which affects the option() command in a similar but subtly different way.
| * | | | Help: Explain policy CMP0125 in more detailCraig Scott2021-07-171-12/+29
| | | | |
| * | | | Help: Clarify wording of CMP0124Craig Scott2021-07-171-7/+5
| | | | |
* | | | | Merge branch 'release-3.21'Craig Scott2021-07-200-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'doc-cleanups-3.21' into release-3.21Craig Scott2021-07-203-30/+47
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d1944c675 Help: Expand details for file(COPY_FILE) c8ea886123 Help: Re-order file() sub-commands in Filesystem section b5a96716eb Help: Clarify which project() call PROJECT_IS_TOP_LEVEL is for 8be7694d97 Help: Fix trivial typo Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6361
* | | | | Merge topic 'doc-cleanups-3.21'Craig Scott2021-07-203-30/+47
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d1944c675 Help: Expand details for file(COPY_FILE) c8ea886123 Help: Re-order file() sub-commands in Filesystem section b5a96716eb Help: Clarify which project() call PROJECT_IS_TOP_LEVEL is for 8be7694d97 Help: Fix trivial typo Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6361
| * | | | Help: Expand details for file(COPY_FILE)Craig Scott2021-07-191-2/+18
| | | | |
| * | | | Help: Re-order file() sub-commands in Filesystem sectionCraig Scott2021-07-191-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file(COPY_FILE) sub-command is closely related to the file(COPY) sub-command. Move the former to just before the latter for improved continuity. The file(RENAME) sub-command is also somewhat related to file(COPY_FILE), so it was also moved to keep it just before file(COPY_FILE). The file(MAKE_DIRECTORY) sub-command was also moved to just before the file(REMOVE) and file(REMOVE_RECURSE) sub-commands to keep them together and improve logical flow of operations.
| * | | | Help: Clarify which project() call PROJECT_IS_TOP_LEVEL is forCraig Scott2021-07-181-1/+2
| | | | |
| * | | | Help: Fix trivial typoCraig Scott2021-07-181-1/+1
| | |/ / | |/| |
* | | | CMake Nightly Date StampKitware Robot2021-07-201-1/+1
| | | |
* | | | Merge branch 'release-3.21'Brad King2021-07-190-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'cmake-presets-no-binary-dir-no-s' into release-3.21Brad King2021-07-194-4/+24
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa874dc609 CMakePresets.json: Fix expansion issue with empty binaryDir Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6358
* | \ \ \ Merge topic 'cmake-presets-no-binary-dir-no-s'Brad King2021-07-194-4/+24
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | aa874dc609 CMakePresets.json: Fix expansion issue with empty binaryDir Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6358
| * | | | CMakePresets.json: Fix expansion issue with empty binaryDirKyle Edwards2021-07-164-4/+24
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | When resolving binaryDir into a full path from a relative path, we forgot to check if binaryDir is altogether empty, causing empty binaryDir's to resolve to the source directory. Fix this. Fixes: #22434
* | | | Merge branch 'release-3.21'Brad King2021-07-190-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'enable_language-CMP0126' into release-3.21Brad King2021-07-1910-0/+31
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3ddd7f3576 enable_language: Fix test for working compiler with CMP0126 NEW behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6355
* | \ \ \ Merge topic 'enable_language-CMP0126'Brad King2021-07-1910-0/+31
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 3ddd7f3576 enable_language: Fix test for working compiler with CMP0126 NEW behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6355
| * | | | enable_language: Fix test for working compiler with CMP0126 NEW behaviorBrad King2021-07-1510-0/+31
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the logic that converts a `try_compile` result from a cache entry to a normal variable to tolerate an existing normal variable under CMP0126 NEW behavior. Otherwise the `try_compile` result is ignored because CMake uses the false value of the normal variable, and CMake incorrectly reports that the compiler does not work. This went unnoticed for some languages (e.g. C and CXX) because the check for a working compiler is skipped if ABI detection works. It does affect other languages (e.g. CSharp). Fixes: #22423
* | | | Merge branch 'release-3.21'Brad King2021-07-190-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'libuv-mingw-arm' into release-3.21Brad King2021-07-191-2/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1aba3a8367 libuv: Fix building with mingw toolchains for ARM/AArch64 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6354
* | \ \ \ Merge topic 'libuv-mingw-arm'Brad King2021-07-191-2/+6
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 1aba3a8367 libuv: Fix building with mingw toolchains for ARM/AArch64 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6354
| * | | | libuv: Fix building with mingw toolchains for ARM/AArch64Martin Storsjö2021-07-151-2/+6
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a backport of f9ad802fa5dd5afe6730f8e00cfdbf98f1d7a969 from the v1.x branch from upstream libuv: mingw: fix building for ARM/AArch64 Don't use x86 inline assembly in these cases, but fall back to __sync_fetch_and_or, similar to _InterlockedOr8 in the MSVC case. This corresponds to what is done in src/unix/atomic-ops.h, where ARM/AArch64 cases end up implementing cmpxchgi with __sync_val_compare_and_swap. PR-URL: https://github.com/libuv/libuv/pull/3236 Reviewed-By: Jameson Nash <vtjnash@gmail.com>
* | | | Merge branch 'release-3.21'Brad King2021-07-190-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'TestDriver-time.h-lint' into release-3.21Brad King2021-07-191-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0bb3d457cb TestDriver: use `CM_NULL` to avoid lints about `nullptr` usage 32ff836e2a TestDriver: suppress deprecated header lints for time.h Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6352
* | \ \ \ Merge topic 'TestDriver-time.h-lint'Brad King2021-07-191-2/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 0bb3d457cb TestDriver: use `CM_NULL` to avoid lints about `nullptr` usage 32ff836e2a TestDriver: suppress deprecated header lints for time.h Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6352
| * | | | TestDriver: use `CM_NULL` to avoid lints about `nullptr` usageBen Boeckel2021-07-141-1/+1
| | | | |
| * | | | TestDriver: suppress deprecated header lints for time.hBen Boeckel2021-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | Similar to the other includes, this one should be suppressed as well.