summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.17.1v3.17.1Brad King2020-04-091-1/+1
|
* Merge topic 'ccmake_incremental_log_display' into release-3.17Brad King2020-04-094-19/+48
|\ | | | | | | | | | | | | | | | | 60bfaa8fe6 ccmake: Use incremental rendering for the logs e9b36731e9 cmCursesLongMessageForm: Factor out helper to draw message to form Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4573
| * ccmake: Use incremental rendering for the logsSylvain Joubert2020-04-084-11/+33
| | | | | | | | | | | | | | | | | | This should avoid an exponential slowdown in the display time for projects with lots of output. This is still slower than cmake due to the ncurses drawing, but it should now be O(L) in total and not O(L^2) wrt to output length. Fixes: #20535
| * cmCursesLongMessageForm: Factor out helper to draw message to formBrad King2020-04-082-8/+15
| |
* | Merge topic 'apple-arch-sysroots' into release-3.17Brad King2020-04-093-13/+31
|\ \ | | | | | | | | | | | | | | | | | | | | | 84a1e67380 Apple: Fix mapping CMAKE_APPLE_ARCH_SYSROOTS to custom OSX_ARCHITECTURES 45fa9b32ca Apple: Improve handling of missing SDKs in CMAKE_APPLE_ARCH_SYSROOTS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4583
| * | Apple: Fix mapping CMAKE_APPLE_ARCH_SYSROOTS to custom OSX_ARCHITECTURESBrad King2020-04-082-11/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `CMAKE_OSX_ARCHITECTURES` value is not used directly by generators. It is used to initialize a per-target `OSX_ARCHITECTURES` property, but that property can also be set explicitly by project code to a subset of the full list of architectures. In order to handle this case, construct a mapping from each `CMAKE_OSX_ARCHITECTURES` entry to the corresponding `CMAKE_APPLE_ARCH_SYSROOTS` entry by name. Use the mapping to find the sysroot for each entry in `OSX_ARCHITECTURES` for a given target. If `CMAKE_APPLE_ARCH_SYSROOTS` does not have the same length as `CMAKE_OSX_ARCHITECTURES`, error out early rather than risking a crash or assertion failure. Fixes: #20534
| * | Apple: Improve handling of missing SDKs in CMAKE_APPLE_ARCH_SYSROOTSBrad King2020-04-082-3/+3
| |/ | | | | | | | | | | | | | | | | | | Use `<arch>-SDK-NOTFOUND` instead of an empty string as a placeholder in `CMAKE_APPLE_ARCH_SYSROOTS` for architectures whose SDK is not found. This ensures the length of `CMAKE_APPLE_ARCH_SYSROOTS` matches the length of `CMAKE_OSX_ARCHITECTURES`. It also makes the missing SDKs more visible in the value. Issue: #20534
* | Merge topic 'ninja-order-depends' into release-3.17Brad King2020-04-081-1/+1
|\ \ | |/ |/| | | | | | | | | 2f949be4b3 Ninja: Make config uppercase in object order target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4581
| * Ninja: Make config uppercase in object order targetKyle Edwards2020-04-071-1/+1
|/ | | | Fixes: #20539
* Merge topic 'llvm-rc-include-path' into release-3.17Brad King2020-04-074-15/+25
|\ | | | | | | | | | | | | 35a29ec827 llvm-rc: Restore include path for data after explicit preprocessing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4570
| * llvm-rc: Restore include path for data after explicit preprocessingThomas Bernard2020-04-064-15/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 1c2d031cbd (Add -E cmake_llvm_rc to preprocess files for llvm-rc, 2020-01-14, v3.17.0-rc1~24^2) with llvm-rc we explicitly preprocess RC source files and then compile separately without -I flags. This broke cases where the RC source references data files adjacent to itself or in the include path. This change adds the expansion of the include paths when calling the llvm-rc in order for the resource files to be picked up correctly by llvm-rc. Since the RC compiled file is first preprocessed, the file being compiled by llvm-rc resides in the build directory. In order for llvm-rc to find the resource data specified relative to the .rc file being compiled, the source file path is preppended in the include list so that the original source path takes priority over all the other includes paths specified. A space was added in the CMAKE_INCLUDE_FLAG_RC to make the include directive work properly for llvm-rc. Checks on the rc.exe showed that the syntax change doesn't affect it's proper operation. Fixes: #20529
* | Merge topic 'doc-3.15-std-fix' into release-3.17Brad King2020-04-061-0/+9
|\ \ | | | | | | | | | | | | | | | | | | 182a104478 Help: Add 3.15 release note for change in -std= flag for compile features Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4574
| * | Help: Add 3.15 release note for change in -std= flag for compile featuresBrad King2020-04-061-0/+9
| | | | | | | | | | | | Issue: #19917
* | | Merge topic 'docs-CMAKE_FIND_DEBUG_MODE' into release-3.17Craig Scott2020-04-062-1/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 477b8b5dfe Help: Improve discoverability of CMAKE_FIND_DEBUG_MODE 218bda9671 Help: Fix CMAKE_FIND_DEBUG_MODE list formatting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4569
| * | | Help: Improve discoverability of CMAKE_FIND_DEBUG_MODECraig Scott2020-04-041-1/+3
| | | |
| * | | Help: Fix CMAKE_FIND_DEBUG_MODE list formattingCraig Scott2020-04-041-0/+1
|/ / /
* | | Merge topic 'ExternalProject-no-extract-bool' into release-3.17Brad King2020-04-032-1/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2c4bb705e8 ExternalProject: allow `DOWNLOAD_NO_EXTRACT OFF` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4562
| * | | ExternalProject: allow `DOWNLOAD_NO_EXTRACT OFF`Ben Boeckel2020-04-022-1/+10
| | | | | | | | | | | | | | | | Fixes: #20531
* | | | Merge topic 'rel-linux-openssl' into release-3.17Brad King2020-04-032-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a66c7674c Utilities/Release: Update to openssl 1.1.1f Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4563
| * | | | Utilities/Release: Update to openssl 1.1.1fBrad King2020-04-032-6/+6
| |/ / /
* | | | Merge topic 'FindPython-fix-VIRTUALENV-eq-FIRST' into release-3.17Brad King2020-04-021-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81beb28752 FindPython: fix handling when FIND_VIRTUALENV == FIRST Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4557
| * | | | FindPython: fix handling when FIND_VIRTUALENV == FIRSTMarc Chevrier2020-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes: #20525
* | | | | Merge topic 'cpack-nsis-version' into release-3.17Brad King2020-04-013-3/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa78a2537c CPack/NSIS: Document and check requirement of at least NSIS 3.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4552
| * | | | | CPack/NSIS: Document and check requirement of at least NSIS 3.0Brad King2020-03-313-3/+19
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 9d2816544e (CPack/NSIS: Also preload the "UserInfo.dll" plugin, 2020-01-04, v3.17.0-rc1~204^2) we require NSIS 3.0. Since older versions do not support Windows 8 or above, we can now require at least version 3.0. Fixes: #20514
* | | | | Merge topic 'xl-cxx14' into release-3.17Brad King2020-04-011-1/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 46d9006efa XL: Add comment clarifying why we pretend it has full C++11/14 support 4aaa9ea96c XL: C++14 language level flags are only available on Linux Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4551
| * | | | | XL: Add comment clarifying why we pretend it has full C++11/14 supportBrad King2020-03-311-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit b0f46c48f6 (CompileFeatures: Now able to presume full language level support, 2019-03-06, v3.15.0-rc1~265^2~1) we pretend that the XL compiler has full C++11 and C++14 support so that projects specifying granular features will at least get the corresponding compiler mode. This is a work around for our lack of a full feature check table for this compiler that works in common cases. Add a comment explaining this. Issue: #20521
| * | | | | XL: C++14 language level flags are only available on LinuxBrad King2020-03-311-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 458ea9d76c (XL: Add C++14 language level flags, 2019-04-15, v3.15.0-rc1~226^2) we use `-qlanglvl=extended1y` for C++14 with XL 16.1. However, that flag is only supported on a Linux host. Issue: #20521
* | | | | Merge topic 'docs_macho_prop_tgt' into release-3.17Brad King2020-03-314-26/+65
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 01b47293ea Help: Fix inaccuracies and omissions in MACHO_* property docs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Isuru Fernando <isuruf@gmail.com> Merge-request: !4542
| * | | | | Help: Fix inaccuracies and omissions in MACHO_* property docsCraig Scott2020-03-314-26/+65
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | The VERSION and SOVERSION properties are not true fallbacks for the MACHO_* properties since the MACHO_* properties only affect the embedded version information, but VERSION and SOVERSION also affect other things.
* | | | | Merge topic 'link-libs-config-case' into release-3.17Brad King2020-03-315-6/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2af18704fd Merge branch 'backport-3.16-link-libs-config-case' 3f976bf201 target_link_libraries: Fix regression in case of $<CONFIG> genex 5a95b5e091 target_link_libraries: Fix regression in case of $<CONFIG> genex Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4544
| * \ \ \ \ Merge branch 'backport-3.16-link-libs-config-case'Brad King2020-03-300-0/+0
| |\ \ \ \ \
| | * | | | | target_link_libraries: Fix regression in case of $<CONFIG> genexBrad King2020-03-305-5/+30
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit b8626261e9 (Precompile headers: Add methods to generate PCH sources, 2019-07-13, v3.16.0-rc1~182^2~4) we look up source files for a target using an upper-case configuration even though an original-case name is sufficient. Since commit 36ded610af (PCH: Generate sources during Compute step, 2019-10-05, v3.16.0-rc1~2^2) the source file lookup is the first time we compute many on-demand structures that depend on the configuration name. This caused the `$<CONFIG>` generator expression to evaluate to the upper-case configuration name in some cases where we used original-case before. Fix this by switching the source file lookup to the original-case config name. Add a test covering the symptom that led to the discovery of this problem. Fixes: #20517
| * | | | | target_link_libraries: Fix regression in case of $<CONFIG> genexBrad King2020-03-305-6/+30
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit b8626261e9 (Precompile headers: Add methods to generate PCH sources, 2019-07-13, v3.16.0-rc1~182^2~4) we look up source files for a target using an upper-case configuration even though an original-case name is sufficient. Since commit 36ded610af (PCH: Generate sources during Compute step, 2019-10-05, v3.16.0-rc1~2^2) the source file lookup is the first time we compute many on-demand structures that depend on the configuration name. This caused the `$<CONFIG>` generator expression to evaluate to the upper-case configuration name in some cases where we used original-case before. Fix this by switching the source file lookup to the original-case config name. Add a test covering the symptom that led to the discovery of this problem. Fixes: #20517
* | | | | Merge topic 'aix-ExportImportList-install' into release-3.17Brad King2020-03-311-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39e5a4da22 AIX: Install ExportImportList script with execute permission Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4545
| * | | | | AIX: Install ExportImportList script with execute permissionBrad King2020-03-301-0/+4
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This script was added by commit 0f150b69d3 (AIX: Explicitly compute shared object exports for both XL and GNU, 2019-07-11, v3.16.0-rc1~418^2~2) but does not have a `.sh` extension so our existing install rules neglect to give it execute permission. Our test suite works on AIX in the build tree but the script is broken without execute permission on installation. Fixes: #20520
* | | | | Merge topic 'docs-xcode-gen-scheme-workdir' into release-3.17Brad King2020-03-303-4/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6905451e11 Help: Add missing XCODE_SCHEME_WORKING_DIRECTORY 6ff07dac76 Help: Minor typos and formatting for XCODE_SCHEME_WORKING_DIRECTORY Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4543
| * | | | Help: Add missing XCODE_SCHEME_WORKING_DIRECTORYCraig Scott2020-03-291-0/+1
| | | | |
| * | | | Help: Minor typos and formatting for XCODE_SCHEME_WORKING_DIRECTORYCraig Scott2020-03-292-4/+4
| | |/ / | |/| |
* | | | Merge topic 'llvm_rc_pp' into release-3.17Brad King2020-03-301-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4bef0e6450 llvm-rc: Enable preprocessing if CMAKE_RC_COMPILER_INIT is an absolute path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4535
| * | | | llvm-rc: Enable preprocessing if CMAKE_RC_COMPILER_INIT is an absolute pathLucas Wang2020-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | `CMAKE_RC_COMPILER_INIT` and `CMAKE_RC_COMPILER` can be set by user, for example `llvm-rc-10` and `D:\LLVM\bin\llvm-rc.exe`.
* | | | | Merge topic 'ninja-multi-doc-variable-update' into release-3.17Craig Scott2020-03-284-43/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c8fd26eb57 Help: Move Ninja Multi-Config variable details into their respective pages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4532
| * | | | | Help: Move Ninja Multi-Config variable details into their respective pagesKyle Edwards2020-03-264-43/+35
| | | | | |
* | | | | | Merge topic 'ctest-timeout-report' into release-3.17Brad King2020-03-274-10/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7fda917fa4 CTest: Fix reported duration on timeout when grindchild keeps pipes open Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4530
| * | | | | | CTest: Fix reported duration on timeout when grindchild keeps pipes openBrad King2020-03-264-10/+16
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit d1976cd1f2 (CTest: Fix timeout when grandchild keeps pipes open, 2020-01-13, v3.17.0-rc1~169^2) we no longer hang, but the test duration we report after the timeout is the amount of time the immediate child ran before exiting. Fix the logic to instead report the actual amount of time we spent monitoring the test before the timeout. Fixes: #20509
* | | | | | Merge topic 'vs-clangcl' into release-3.17Brad King2020-03-271-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f3d7a15010 VS: Fix ClangCL toolset compiler path detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4523
| * | | | | | VS: Fix ClangCL toolset compiler path detectionBrad King2020-03-261-1/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to commit 3c125c6de0 (VS: Support Visual Studio Clang Toolkit identification, 2019-12-03, v3.17.0-rc1~341^2) using `-T ClangCL` would work but `CMAKE_{C,CXX}_COMPILER` would be detected as `cl.exe` even though `clang-cl.exe` is the actual compiler. That commit attempted to fix the detection by using `$(ClangClExecutable)` as we do for LLVM-distributed toolsets, but that is not actually defined. Instead, look for `$(CLToolExe)` in the `PATH`. Fixes: #20504
* | | | | | Merge topic 'FindPython-variable-spelling-error' into release-3.17Brad King2020-03-271-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63580668a8 FindPython: fix variable spelling error Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4529
| * | | | | | FindPython: fix variable spelling errorMarc Chevrier2020-03-261-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'CheckIPOSupported-cleanup-cache' into release-3.17Brad King2020-03-271-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b8297721f CheckIPOSupported: Avoid polluting cache with common name 'result' Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4528
| * | | | | | CheckIPOSupported: Avoid polluting cache with common name 'result'Brad King2020-03-261-2/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | Fixes: #20508
generated by cgit v0.12 at 2025-01-25 09:42:20 (GMT)