summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* curl: Update build within CMake to account for 7.61 changesBrad King2018-10-222-2/+1
| | | | | | | The_CURL_STATICLIB option was replaced by BUILD_SHARED_LIBS. Drop our own CURL_STATICLIB compile definition because it is now provided by curl's usage requirements.
* curl: Backport to work with CMake 3.1 againBrad King2018-10-221-2/+3
| | | | | | Curl 7.61.1 requires CMake 3.4 to build from source and also exposes a dependency on OpenSSL imported targets. Revert that part of the changes imported from curl upstream.
* Merge branch 'upstream-curl' into update-curlBrad King2018-10-22112-1858/+2567
|\ | | | | | | | | * upstream-curl: curl 2018-09-04 (432eb5f5)
| * curl 2018-09-04 (432eb5f5)Curl Upstream2018-10-22112-1865/+2573
| | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 432eb5f5c254ee8383b2522ce597c9219877923e (curl-7_61_1).
* | curl: Update script to get curl 7.61.1Brad King2018-10-221-1/+1
| |
* | Merge topic 'doc-3.13-relnotes'Brad King2018-10-0342-266/+233
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 00d96c51c9 Help: Organize and revise 3.13 release notes 2fd2c8cb7e Help: Consolidate 3.13 release notes Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Marc Chevrier <marc.chevrier@gmail.com> Reviewed-by: Craig Scott <craig.scott@crascit.com> Merge-request: !2426
| * | Help: Organize and revise 3.13 release notesBrad King2018-10-011-123/+161
| | | | | | | | | | | | | | | Add section headers similar to the 3.12 release notes and move each individual bullet into an appropriate section. Revise a few bullets.
| * | Help: Consolidate 3.13 release notesBrad King2018-10-0142-266/+195
| | | | | | | | | | | | | | | Run the `Utilities/Release/consolidate-relnotes.bash` script to move notes from `Help/release/dev/*` into `Help/release/3.13.rst`.
* | | Merge topic 'ctest-num-width'Brad King2018-10-031-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6d28884617 cmCTestRunTest: Avoid float/int conversions in number width logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2433
| * | | cmCTestRunTest: Avoid float/int conversions in number width logicBrad King2018-10-021-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use of `std::log10` added by commit 02c5091c90 (cmCTestRunTest: Simplify number width computation, 2018-09-08) broke our number width computation on some platforms where static_cast<int>(std::log10(static_cast<size_t>(10))) somehow produces `0` instead of `1`. Re-implement the logic to avoid floating-point computations.
* | | | Merge branch 'release-3.12'Brad King2018-10-030-0/+0
|\ \ \ \
| * | | | CMake 3.12.3v3.12.3Brad King2018-10-031-1/+1
| | | | |
* | | | | Merge topic 'java-documentation-update'Brad King2018-10-032-33/+59
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d23264b50 FindJava: Update module documentation 047bf93748 FindJNI: Update module documentation b6104f87cc FindJNI: Add Ubuntu 18.04 path to java-11-openjdk Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2436
| * | | | | FindJava: Update module documentationBartosz Kosiorek2018-10-031-10/+15
| | | | | |
| * | | | | FindJNI: Update module documentationBartosz Kosiorek2018-10-031-23/+43
| | | | | |
| * | | | | FindJNI: Add Ubuntu 18.04 path to java-11-openjdkBartosz Kosiorek2018-10-031-0/+1
| | | | | |
* | | | | | Merge branch 'release-3.12'Brad King2018-10-030-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'fix-csharp-target-type' into release-3.12Brad King2018-10-025-6/+21
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2427
| * \ \ \ \ \ Merge branch 'libuv-gnu-hurd' into release-3.12Brad King2018-10-011-8/+39
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2422
* | \ \ \ \ \ \ Merge topic 'bug-fixes'Brad King2018-10-034-11/+33
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63c9356544 FindPython*: fix erroneous handling of virtual environments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2430
| * | | | | | | | FindPython*: fix erroneous handling of virtual environmentsMarc Chevrier2018-10-024-11/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes: #18408
* | | | | | | | | Merge topic 'update-kwsys'Brad King2018-10-031-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0da3340b9c Merge branch 'upstream-KWSys' into update-kwsys b6a689c6f8 KWSys 2018-10-03 (9d6873b1) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2437
| * \ \ \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-10-031-0/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-10-03 (9d6873b1)
| | * | | | | | | | KWSys 2018-10-03 (9d6873b1)KWSys Upstream2018-10-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 9d6873b11837f341027c9a6f2880708126f08b8b (master). Upstream Shortlog ----------------- E5ten (1): f17f22a2 Terminal: Add alacritty and alacritty-direct to VT100 color support whitelist
* | | | | | | | | | Merge topic 'fix-csharp-target-type'Brad King2018-10-035-6/+21
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 375b420fdf CSharp: Fix regression in VS project type selection 8b21aa0af0 VS: Fix CSharp flag selection when linking to a static C++ library Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2427
| * | | | | | | | | CSharp: Fix regression in VS project type selectionBrad King2018-10-024-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A that target contains only `.cs` sources should be generated as a `.csproj` project even if it links to non-CSharp static libraries. The latter case was broken by refactoring in commit v3.12.0-rc1~160^2~7 (remove TargetIsCSharpOnly() and use methods from cmGeneratorTarget, 2018-03-19). The reason is that the `HasLanguage` method added by commit v3.12.0-rc1~239^2~6 (cmGeneratorTarget: add HasLanguage() as wrapper for GetLanguages(), 2018-03-19) enforces its "exclusive" check on the combined set of source file languages and the link language. To restore the original `TargetIsCSharpOnly` semantics, update `HasLanguage` to enforce exclusiveness only on the list of sources. Fixes: #18239
| * | | | | | | | | VS: Fix CSharp flag selection when linking to a static C++ libraryBrad King2018-10-021-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a CSharp target links to a static C++ library, CMake will compute the link language as C++ instead of CSharp. That may be incorrect and needs further investigation, but it does not affect how VS drives C# linking. However, it does break our flag language selection logic and causes C++ flags to be used for CSharp. In particular, this drops the `-platform:x86` flag on 32-bit builds. Fix this by always selecting the CSharp flags when generating a `.csproj` project type. Issue: #18239
* | | | | | | | | | Merge topic 'libuv-gnu-hurd'Brad King2018-10-031-8/+39
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | / / / / | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | 3c0bfb596f libuv: do not require PATH_MAX to be defined Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2422
| * | | | | | | | libuv: do not require PATH_MAX to be definedBrad King2018-10-011-8/+39
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some platforms (e.g. GNU/Hurd) do not define PATH_MAX. Add a few other variants and a fallback constant. Also use alternatives where possible: * For readlink(), use lstat() to read the length of the link first. If it is not a symlink, report EINVAL before trying to allocate. If the size reports as zero, fall back one of the PATH_MAX variants. * For realpath(), POSIX 2008 allows us to pass a NULL buffer to tell it to malloc() internally. This patch was inspired by downstream patches in Debian packaging for issues 897061 and 909011. Issue: #18337
* | | | | | | | CMake Nightly Date StampKitware Robot2018-10-031-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'csharp_versions'Brad King2018-10-021-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 94c406eb49 VS: Update CSharp flag table to support new language versions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2425
| * | | | | | | | VS: Update CSharp flag table to support new language versionsDean Glazeski2018-10-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is based off of the latest 15.8.5 release of VS 2017. CSC version 2.9.0.63208 (958f2354).
* | | | | | | | | Merge topic 'install-directory-permissions-fix'Brad King2018-10-022-18/+45
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5e61b79b82 install: Set permissions on directories created by install(DIRECTORY) fbd89b6753 Help: Add note about CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2428
| * | | | | | | | install: Set permissions on directories created by install(DIRECTORY)Kyle Edwards2018-10-011-18/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The directories that are implicitly created by install(DIRECTORY) were not having their permissions being set by CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS. This change refactors cmFileCopier to take this into account for directory installation.
| * | | | | | | | Help: Add note about CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONSKyle Edwards2018-10-011-0/+7
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2018-10-021-1/+1
|/ / / / / / /
* | | | | | | Merge topic 'no_buildid_for_files'Brad King2018-10-015-20/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c49d13f94b ctest: only create buildid when submitting from Testing/ dir Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2423
| * | | | | | | ctest: only create buildid when submitting from Testing/ dirZack Galbreath2018-09-285-20/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 7f530cc we taught CTest to pass extra information to CDash at submit time. This extra info is used by CDash to initialize a buildid. `ctest_submit(FILES)` can be used to send specific files to CDash. These files are not necessarily associated with the build currently being performed. For this reason, we modify the behavior of ctest_submit() to only specify this extra info when we are submitting files from the current build's Testing directory.
* | | | | | | | Merge topic 'byproducts_make_clean'Brad King2018-10-019-4/+212
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80e2f8ee0c Ninja,Makefile: Add tests for handling of byproducts by clean operations c7f1ed03d7 Help: Add release note for make clean and byproducts 4220962d18 Makefile: Add build events byproducts to clean rules 182d9597ec Makefile: Add custom command byproducts to clean rules 9c2b393cb7 Tests: Update CustomCommandWorkingDirectory to handle in-source byproducts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2334
| * | | | | | | Ninja,Makefile: Add tests for handling of byproducts by clean operationsPedro Navarro2018-09-286-0/+173
| | | | | | | |
| * | | | | | | Help: Add release note for make clean and byproductsPedro Navarro2018-09-281-0/+5
| | | | | | | |
| * | | | | | | Makefile: Add build events byproducts to clean rulesPedro Navarro2018-09-281-0/+24
| | | | | | | |
| * | | | | | | Makefile: Add custom command byproducts to clean rulesPedro Navarro2018-09-281-0/+6
| | | | | | | |
| * | | | | | | Tests: Update CustomCommandWorkingDirectory to handle in-source byproductsPedro Navarro2018-09-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running an in-source build the CustomCommandWorkingDirectory test created a copy of a source file in the same directory it was running on. This breaks when byproducts are cleaned (e.g. via Ninja) because it deletes one of the source files.
* | | | | | | | Merge topic 'add_progress_summary_console_logging_mode'Brad King2018-10-017-61/+203
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b3d5b8b3fb ctest: Add option for live progress summary in terminal 62fbe5002a cmCTestRunTest: Thread number of completed tests through start APIs 02c5091c90 cmCTestRunTest: Simplify number width computation 6a285bb737 cmCTestRunTest: Buffer test result output before printing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2240
| * | | | | | | ctest: Add option for live progress summary in terminalMichael Wegner2018-09-266-21/+167
| | | | | | | |
| * | | | | | | cmCTestRunTest: Thread number of completed tests through start APIsMichael Wegner2018-09-253-7/+8
| | | | | | | |
| * | | | | | | cmCTestRunTest: Simplify number width computationMichael Wegner2018-09-251-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a real logarithm implementation.
| * | | | | | | cmCTestRunTest: Buffer test result output before printingMichael Wegner2018-09-251-28/+29
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2018-10-011-1/+1
| | | | | | | |
generated by cgit v0.12 at 2025-01-02 18:11:45 (GMT)