summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmCursesLongMessageForm: avoid unnecessary string allocationBen Boeckel2020-04-091-1/+2
| | | | | The addition makes a temporary string and then drops it after adding it to `this->Messages`. Instead, just incrementally append.
* Merge topic 'file-upload-tls'Brad King2020-04-0916-19/+80
|\ | | | | | | | | | | | | bf94dcba76 file(UPLOAD): Add support for TLS_VERIFY and TLS_CAINFO Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4580
| * file(UPLOAD): Add support for TLS_VERIFY and TLS_CAINFOHarry Mallon2020-04-0816-19/+80
| | | | | | | | | | * Improve and test err messages when TLS_VERIFY and TLS_CAINFO are not set in file(DOWNLOAD) and file(UPLOAD).
* | Merge topic 'CTestCoverageCollectGCOV-log'Brad King2020-04-091-3/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | 5b12fe4633 CTestCoverageCollectGCOV: Avoid capturing gcov output in QUIET mode 43aaf2ac1e CTestCoverageCollectGCOV: Capture gcov output in log file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4582
| * | CTestCoverageCollectGCOV: Avoid capturing gcov output in QUIET modeBrad King2020-04-081-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | The `QUIET` mode suppresses any mention of our logged output, so do not bother logging it. This also provides a way for users to avoid saving possibly large output on disk. Fixes: #20554
| * | CTestCoverageCollectGCOV: Capture gcov output in log fileBrad King2020-04-081-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | The output of gcov can be large and we only display it in a failure case. Put it in a log file to avoid accumulating large output in memory. Issue: #20554
* | | Merge branch 'release-3.17'Brad King2020-04-090-0/+0
|\ \ \
| * \ \ 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
* | \ \ \ Merge topic 'ccmake_incremental_log_display'Brad 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 branch 'release-3.17'Brad King2020-04-090-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
* | \ \ \ \ Merge topic 'apple-arch-sysroots'Brad King2020-04-093-14/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da25220d83 Merge branch 'backport-3.17-apple-arch-sysroots' into apple-arch-sysroots 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
| * \ \ \ \ \ Merge branch 'backport-3.17-apple-arch-sysroots' into apple-arch-sysrootsBrad King2020-04-083-14/+32
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | / | | |_|_|_|/ | |/| | | |
| | * | | | 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 'update-kwsys'Brad King2020-04-091-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5abe64246d Merge branch 'upstream-KWSys' into update-kwsys 11d846b8ff KWSys 2020-04-09 (e798e567) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4588
| * \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-04-091-0/+4
| |\ \ \ \ \ |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-04-09 (e798e567)
| * | | | | KWSys 2020-04-09 (e798e567)KWSys Upstream2020-04-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit e798e567760aaa6b87c31035c3f74622ecdcb5b2 (master). Upstream Shortlog ----------------- Brad King (1): 41700ca4 SystemTools: Fix FileIsExecutable on Windows
* | | | | | CMake Nightly Date StampKitware Robot2020-04-091-1/+1
| |/ / / / |/| | | |
* | | | | Merge branch 'release-3.17'Brad King2020-04-080-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | 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
* | | | | Merge topic 'ninja-order-depends'Brad King2020-04-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d54f0aa9b7 Merge branch 'master' into ninja-order-depends 2f949be4b3 Ninja: Make config uppercase in object order target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4581
| * \ \ \ \ Merge branch 'master' into ninja-order-dependsKyle Edwards2020-04-071388-170007/+73511
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Ninja: Make config uppercase in object order targetKyle Edwards2020-04-071-1/+1
| | |/ / / | |/| | | | | | | | | | | | | Fixes: #20539
* | | | | Merge topic 'file-upload-tls'Brad King2020-04-081-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9427763081 file(UPLOAD): Add default ca_certs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4579
| * | | | | file(UPLOAD): Add default ca_certsHarry Mallon2020-04-071-0/+7
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Default ca_certs were not added when using `UPLOAD` with built-in (non-system) cURL. Previously we only did this for `DOWNLOAD`. Fixes: #20551
* | | | | Merge topic 'update-kwsys'Brad King2020-04-084-11/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff2e597ba2 Merge branch 'upstream-KWSys' into update-kwsys c5635588ad KWSys 2020-04-07 (caff9c3b) 2cc7baa1bc Tests: Fix get_filename_component PROGRAM test to use an executable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4578
| * \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-04-072-7/+17
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-04-07 (caff9c3b)
| | * | | | KWSys 2020-04-07 (caff9c3b)KWSys Upstream2020-04-072-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit caff9c3bf3c9a95f4ac7f700532633603352e506 (master). Upstream Shortlog ----------------- Vladimir Menshakov (1): 66724af8 SystemTools: Teach FindProgram to find non-readable programs
| * | | | | Tests: Fix get_filename_component PROGRAM test to use an executableBrad King2020-04-072-4/+5
| | |/ / / | |/| | |
* | | | | Merge topic 'update-libuv'Brad King2020-04-0868-1497/+3991
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 630e501f8b libuv: Restore compilation on Apple i386 architecture 02a28f1d44 libuv: Restore compilation with XLClang 16.1 on AIX 82a06d5cb4 CTestCustom: Suppress scanbuild warning in libuv 722d6b4105 Merge branch 'upstream-libuv' into update-libuv 394b07af40 libuv 2020-04-06 (d21f5aea) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4576
| * | | | libuv: Restore compilation on Apple i386 architectureBrad King2020-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libuv upstream commit `2475296c` (build: make code compilable for iOS on Xcode, 2020-01-18, v1.35.0~47) added a `defined(TARGET_OS_IPHONE)` preprocessor condition, but `TARGET_OS_IPHONE` is always defined on Apple to either 0 or 1.
| * | | | libuv: Restore compilation with XLClang 16.1 on AIXBrad King2020-04-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libuv upstream commit `4a972bf0` (aix: Fix broken cmpxchgi() XL C++ specialization., 2019-09-06, v1.32.0~5) broke compilation with this compiler. According to https://www.ibm.com/support/knowledgecenter/SSGH3R_16.1.0/com.ibm.xlcpp161.aix.doc/migrate/migrate_to_xlclang.html XLClang 16.1 for AIX does not support `__sync_val_compare_and_swap`. The documentation suggests using C++11 atomic operations instead, but this is C code. For now fall back to the non-atomic equivalent used before so we can at least compile. Add a FIXME comment for this.
| * | | | CTestCustom: Suppress scanbuild warning in libuvBrad King2020-04-071-0/+1
| | | | | | | | | | | | | | | | | | | | This is third-party code.
| * | | | Merge branch 'upstream-libuv' into update-libuvBrad King2020-04-0667-1497/+3984
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-libuv: libuv 2020-04-06 (d21f5aea)
| | * | | | libuv 2020-04-06 (d21f5aea)libuv upstream2020-04-0667-1498/+3985
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libuv/libuv.git at commit d21f5aeab0a4b6193f13640471cde405579f9c69 (v1.x).
* | | | | | CMake Nightly Date StampKitware Robot2020-04-081-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'file-GetRuntimeDependencies_support_cross_compilation'Brad King2020-04-079-2/+102
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f867423aa2 file: GetRuntimeDependencies use CMAKE_OBJDUMP when applicable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4538
| * | | | | file: GetRuntimeDependencies use CMAKE_OBJDUMP when applicableRobert Maynard2020-04-069-2/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On machines where the gnu bin utils are prefixed, or suffixed the file(GET_RUNTIME_DEPENDENCIES ) command would fail without explicitly setting the location of objdump. Now we pre-populate the variables used to find objdump based on the gnu bin utils, so that these use cases are better supported
* | | | | | Merge branch 'release-3.17'Brad King2020-04-070-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | 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
* | \ \ \ \ \ Merge topic 'llvm-rc-include-path'Brad 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 'UseJava-clean-stale'Brad King2020-04-072-2/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4559eb490a UseJava: clean class files from previous builds Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Leonid Pospelov <pospelovlm@yandex.ru> Merge-request: !4381
| * | | | | | | UseJava: clean class files from previous buildsAlexey Karndshev2020-04-062-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If java_class_filelist exists, remove previous class files before building the new ones. If java_sources content has changed, clean and rebuild the class files of the target. Fixes: #20377
* | | | | | | | Merge topic 'update-kwsys'Brad King2020-04-072-48/+55
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dd8365b3f1 Merge branch 'upstream-KWSys' into update-kwsys fe6d7d6c42 KWSys 2020-04-06 (af1f389c) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4572
| * \ \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-04-062-48/+55
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-04-06 (af1f389c)
| | * | | | | | | KWSys 2020-04-06 (af1f389c)KWSys Upstream2020-04-062-48/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit af1f389ca9709a78fdf0103cc20175533054a3e7 (master). Upstream Shortlog ----------------- Brad King (4): 313b2f7a SystemTools: Make SystemToolsStatic singleton private to implementation file 019afb6e SystemTools: Drop GetCurrentWorkingDirectory 'collapse' argument c35a377f SystemTools: Refactor CollapseFullPath to call getcwd only when needed e3989b18 SystemTools: Restore GetCurrentWorkingDirectory slash conversion on Windows
generated by cgit v0.12 at 2025-01-26 19:09:26 (GMT)