summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'UseSWIG-php-regression' into release-3.13Brad King2018-10-081-0/+4
|\ | | | | | | Merge-request: !2448
| * UseSWIG: fix regression for PHP languageMarc Chevrier2018-10-051-0/+4
| | | | | | | | | | | | | | Refactoring in commit v3.12.0-rc1~481^2 (UseSWIG: modernize module, 2018-01-29) accidentally regressed support for PHP. Fix it. Fixes: #18421
* | Merge branch 'autogen-moc-predef-cross-compile' into release-3.13Brad King2018-10-082-0/+9
|\ \ | | | | | | | | | Merge-request: !2452
| * | Android: Add clang --target= flag to compiler predefines commandBrad King2018-10-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | When we set `CMAKE_<LANG>_COMPILER_TARGET` to the Android target architecture, add it to `CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND` also. This is needed to make moc predefines aware of `__ANDROID__`. Fixes: #18425
| * | Autogen: Add clang --target= flag to compiler predefines commandBrad King2018-10-051-0/+8
| | | | | | | | | | | | | | | | | | | | | Respect the compiler target value `CMAKE_<LANG>_COMPILER_TARGET` in `CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND`. Issue: #18425
* | | Merge branch 'doc-find_package-update' into release-3.13Brad King2018-10-051-35/+48
|\ \ \ | | | | | | | | | | | | Merge-request: !2446
| * | | Help: Clarify find_package Module and Config mode relationJoachim Wuttke (l)2018-10-041-17/+17
| | | |
| * | | Help: Remove redundant recommendationBrad King2018-10-041-12/+4
| | | | | | | | | | | | | | | | | | | | We suggest that users prefer the basic signature in two places. Drop the latter and move its related content to a better section.
| * | | Help: Add internal section link to find_package command docsJoachim Wuttke (l)2018-10-041-6/+8
| | | |
| * | | Help: Add section headers to find_package commandJoachim Wuttke (l)2018-10-041-0/+15
| | | | | | | | | | | | | | | | | | | | The document is pretty long but is already mostly organized into sections. Add explicit section headers.
| * | | Help: Move find_package NO_POLICY_SCOPE to more appropriate locationJoachim Wuttke (l)2018-10-041-3/+3
| | | |
| * | | Help: Add table of contents to find_package command docsJoachim Wuttke (l)2018-10-041-0/+4
| | | |
| * | | Help: Rephrase summary in find_package command docsJoachim Wuttke (l)2018-10-041-1/+1
| |/ /
* | | Merge branch 'doc-osx-vars-as-cache' into release-3.13Brad King2018-10-041-0/+2
|\ \ \ | | | | | | | | | | | | Merge-request: !2443
| * | | Help: Document CMAKE_OSX_* variables as cache entriesJames Turner2018-10-041-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The variables * CMAKE_OSX_ARCHITECTURES * CMAKE_OSX_DEPLOYMENT_TARGET * CMAKE_OSX_SYSROOT should be set as cache entries. Document this explicitly.
* | | Merge branch 'pkgc-op-lt-gt' into release-3.13Brad King2018-10-044-1/+91
|\ \ \ | | | | | | | | | | | | Merge-request: !2435
| * | | FindPkgConfig: support also > and < operators for version comparesRolf Eike Beer2018-10-044-1/+91
| |/ / | | | | | | | | | Fixes: #18416
* | | Merge branch 'misc-typos' into release-3.13Brad King2018-10-049-13/+13
|\ \ \ | | | | | | | | | | | | Merge-request: !2440
| * | | Fix misc. typosluz.paz2018-10-039-13/+13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Found via `codespell -q 3 -I ../cmake-whitelist.txt --skip="./Utilities"` where the whitelist consists of ``` aci ans behaviour buil convertor dum earch ect emmited emmitted helpfull iff isnt ith lowercased mose nd nknown nto objext ot pathes pevents splitted substract superceded supercedes te tim todays uint upto whitespaces ```
* | | Merge branch 'doc-cmp0077' into release-3.13Brad King2018-10-042-6/+44
|\ \ \ | | | | | | | | | | | | Merge-request: !2439
| * | | Help: Clarify policy CMP0077 documentationBrad King2018-10-032-6/+44
| |/ / | | | | | | | | | | | | | | | | | | Add background about the case in which the policy is relevant. Describe the OLD and NEW behaviors more completely. Fixes: #18418
* | | Merge branch 'platform-gnu' into release-3.13Brad King2018-10-041-0/+27
|\ \ \ | | | | | | | | | | | | Merge-request: !2438
| * | | Platform/GNU: Add Debian shared library permissions policySvante Signell2018-10-031-0/+27
| |/ / | | | | | | | | | | | | | | | Copy the `CMAKE_INSTALL_SO_NO_EXE` setting from `Platform/Linux`. Fixes: #18376
* | | CMake 3.13.0-rc1 version updateBrad King2018-10-032-4/+4
| | |
* | | Help: Drop development topic notes to prepare releaseBrad King2018-10-032-9/+0
|/ / | | | | | | | | Release versions do not have the development topic section of the CMake Release Notes index page.
* | 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
| | | | | | |