summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.21'Brad King2021-07-230-0/+0
|\
| * Merge topic 'iar-binutils' into release-3.21Brad King2021-07-233-86/+54
| |\ | | | | | | | | | | | | | | | | | | 5b9bfe738c IAR: Moved search logic to BinUtils. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6372
* | \ Merge topic 'iar-binutils'Brad King2021-07-233-86/+54
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 5b9bfe738c IAR: Moved search logic to BinUtils. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6372
| * | IAR: Moved search logic to BinUtils.Jean-Marc Hengen2021-07-233-86/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The search logic for the IAR linker, librarian and related tools is moved from `Modules/Compiler/IAR-FindBinUtils.cmake` to `Modules/CMakeFindBinUtils.cmake` by introducing an new elseif block for the IAR toolchain. The search logic was refactored to omit repeating itself. Fixes: #22425
* | | CMake Nightly Date StampKitware Robot2021-07-231-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2021-07-221-1/+1
| | |
* | | Merge branch 'release-3.21'Brad King2021-07-210-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'message-color' into release-3.21Brad King2021-07-215-0/+26
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | c7a8c9c811 cmMessenger: Revert to non-color messages on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6369
* | \ \ Merge topic 'message-color'Brad King2021-07-215-0/+26
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | c7a8c9c811 cmMessenger: Revert to non-color messages on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6369
| * | | cmMessenger: Revert to non-color messages on WindowsBrad King2021-07-205-0/+26
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 0a0a0f8a74 (cmMessenger: Color messages to terminal by type, 2021-05-18, v3.21.0-rc1~146^2) the message output no longer goes through our custom streambuf on Windows that converts output encoding. This can cause messages to be printed with the wrong encoding in a Windows Console. It also causes messages to have a mix of LF and CRLF newlines because `stderr` converts LF to CRLF but our custom streambuf does not. Revert to using just `cerr` for messages on Windows. Another approach will be needed to achieve color output on Windows later. Fixes: #22444
* | | Merge branch 'release-3.21'Brad King2021-07-210-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'CMakeDependentOption-revert-parens' into release-3.21Brad King2021-07-215-12/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | d777ca12f6 CMakeDependentOption: Revert "Allow parentheses in the depends string" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6368
* | \ \ Merge topic 'CMakeDependentOption-revert-parens'Brad King2021-07-215-12/+7
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | d777ca12f6 CMakeDependentOption: Revert "Allow parentheses in the depends string" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6368
| * | | CMakeDependentOption: Revert "Allow parentheses in the depends string"Brad King2021-07-205-12/+7
| | |/ | |/| | | | | | | | | | | | | | | | | | | Revert commit 0665d9092e (CMakeDependentOption: Allow parentheses in the depends string, 2021-06-13, v3.21.0-rc1~32^2). It broke existing use cases with parentheses in regular expressions. Also add a test for this. Fixes: #22447
* | | Merge branch 'release-3.21'Brad King2021-07-210-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'toolchain-CMP0126' into release-3.21Brad King2021-07-2112-0/+29
| |\ \ | | |/ | |/| | | | | | | | | | | | | 144be54dd3 try_compile: Propagate CMP0126 to the generated test project Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6366
* | | Merge topic 'toolchain-CMP0126'Brad King2021-07-2112-0/+29
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 144be54dd3 try_compile: Propagate CMP0126 to the generated test project Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6366
| * | try_compile: Propagate CMP0126 to the generated test projectBrad King2021-07-2012-0/+29
| | | | | | | | | | | | | | | Set policy CMP0126 to the value used in the calling project. It may affect toolchain file behavior.
* | | CMake Nightly Date StampKitware Robot2021-07-211-1/+1
| | |
* | | 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
| | | | |