Commit Graph

40758 Commits

Author SHA1 Message Date
Brad King c780f5eea7 Merge branch 'UseSWIG-php-regression' into release-3.13
Merge-request: !2448
2018-10-08 11:09:18 -04:00
Brad King d92737821f Merge branch 'autogen-moc-predef-cross-compile' into release-3.13
Merge-request: !2452
2018-10-08 11:09:08 -04:00
Marc Chevrier ecd0fec40b UseSWIG: fix regression for PHP language
Refactoring in commit v3.12.0-rc1~481^2 (UseSWIG: modernize module,
2018-01-29) accidentally regressed support for PHP.  Fix it.

Fixes: #18421
2018-10-05 13:11:17 -04:00
Brad King 66f49d1f9a Android: Add clang --target= flag to compiler predefines command
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
2018-10-05 10:23:52 -04:00
Brad King 39534c58c5 Autogen: Add clang --target= flag to compiler predefines command
Respect the compiler target value `CMAKE_<LANG>_COMPILER_TARGET` in
`CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND`.

Issue: #18425
2018-10-05 10:23:52 -04:00
Brad King 3261e18f03 Merge branch 'doc-find_package-update' into release-3.13
Merge-request: !2446
2018-10-05 07:54:27 -04:00
Joachim Wuttke (l) c90f3dff82 Help: Clarify find_package Module and Config mode relation 2018-10-04 16:43:40 -04:00
Brad King 26dac50220 Help: Remove redundant recommendation
We suggest that users prefer the basic signature in two places.
Drop the latter and move its related content to a better section.
2018-10-04 16:43:02 -04:00
Joachim Wuttke (l) 11058a2e7c Help: Add internal section link to find_package command docs 2018-10-04 16:42:42 -04:00
Joachim Wuttke (l) aaf5ea2d70 Help: Add section headers to find_package command
The document is pretty long but is already mostly organized into
sections.  Add explicit section headers.
2018-10-04 14:57:56 -04:00
Joachim Wuttke (l) 56310b0671 Help: Move find_package NO_POLICY_SCOPE to more appropriate location 2018-10-04 14:57:56 -04:00
Joachim Wuttke (l) 336dce1c95 Help: Add table of contents to find_package command docs 2018-10-04 14:57:55 -04:00
Joachim Wuttke (l) 463d59d331 Help: Rephrase summary in find_package command docs 2018-10-04 14:57:49 -04:00
Brad King c4ff696971 Merge branch 'doc-osx-vars-as-cache' into release-3.13
Merge-request: !2443
2018-10-04 14:37:51 -04:00
James Turner bc57c32d7a Help: Document CMAKE_OSX_* variables as cache entries
The variables

* CMAKE_OSX_ARCHITECTURES
* CMAKE_OSX_DEPLOYMENT_TARGET
* CMAKE_OSX_SYSROOT

should be set as cache entries.  Document this explicitly.
2018-10-04 11:23:07 -04:00
Brad King a9ff6cefe5 Merge branch 'pkgc-op-lt-gt' into release-3.13
Merge-request: !2435
2018-10-04 10:35:39 -04:00
Rolf Eike Beer aa51bfd74f FindPkgConfig: support also > and < operators for version compares
Fixes: #18416
2018-10-04 10:32:13 -04:00
Brad King a9b442cdc7 Merge branch 'misc-typos' into release-3.13
Merge-request: !2440
2018-10-04 10:13:12 -04:00
Brad King 9de94f10ae Merge branch 'doc-cmp0077' into release-3.13
Merge-request: !2439
2018-10-04 10:13:03 -04:00
Brad King 1049a420ec Merge branch 'platform-gnu' into release-3.13
Merge-request: !2438
2018-10-04 10:12:53 -04:00
luz.paz 6b4c5a0365 Fix misc. typos
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
```
2018-10-03 15:32:46 -04:00
Svante Signell c990649b8c Platform/GNU: Add Debian shared library permissions policy
Copy the `CMAKE_INSTALL_SO_NO_EXE` setting from `Platform/Linux`.

Fixes: #18376
2018-10-03 13:12:21 -04:00
Brad King 94652e8733 CMake 3.13.0-rc1 version update 2018-10-03 12:53:38 -04:00
Brad King f7722fc939 Help: Drop development topic notes to prepare release
Release versions do not have the development topic section of
the CMake Release Notes index page.
2018-10-03 12:52:15 -04:00
Brad King 53a391561e Help: Clarify policy CMP0077 documentation
Add background about the case in which the policy is relevant.
Describe the OLD and NEW behaviors more completely.

Fixes: #18418
2018-10-03 11:58:22 -04:00
Brad King fd02538974 Merge topic 'doc-3.13-relnotes'
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
2018-10-03 11:47:15 -04:00
Brad King 0b1b842e93 Merge topic 'ctest-num-width'
6d28884617 cmCTestRunTest: Avoid float/int conversions in number width logic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2433
2018-10-03 11:38:46 -04:00
Brad King 583060a969 Merge branch 'release-3.12' 2018-10-03 09:42:51 -04:00
Brad King 89289746ff Merge topic 'java-documentation-update'
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
2018-10-03 08:21:50 -04:00
Brad King 3e5548784d CMake 3.12.3 v3.12.3 2018-10-03 08:20:44 -04:00
Brad King b2e7970329 Merge branch 'release-3.12' 2018-10-03 08:10:38 -04:00
Brad King cf9f3852dd Merge topic 'bug-fixes'
63c9356544 FindPython*: fix erroneous handling of virtual environments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2430
2018-10-03 08:06:08 -04:00
Brad King 868ced8619 Merge topic 'update-kwsys'
0da3340b9c Merge branch 'upstream-KWSys' into update-kwsys
b6a689c6f8 KWSys 2018-10-03 (9d6873b1)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2437
2018-10-03 08:05:32 -04:00
Brad King 9fc3024f62 Merge topic 'fix-csharp-target-type'
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
2018-10-03 08:04:35 -04:00
Brad King a4b9e59568 Merge topic 'libuv-gnu-hurd'
3c0bfb596f libuv: do not require PATH_MAX to be defined

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2422
2018-10-03 08:03:47 -04:00
Bartosz Kosiorek 8d23264b50 FindJava: Update module documentation 2018-10-03 07:50:03 -04:00
Bartosz Kosiorek 047bf93748 FindJNI: Update module documentation 2018-10-03 07:49:49 -04:00
Bartosz Kosiorek b6104f87cc FindJNI: Add Ubuntu 18.04 path to java-11-openjdk 2018-10-03 07:48:44 -04:00
Brad King 0da3340b9c Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2018-10-03 (9d6873b1)
2018-10-03 07:36:04 -04:00
KWSys Upstream b6a689c6f8 KWSys 2018-10-03 (9d6873b1)
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
2018-10-03 07:36:03 -04:00
Kitware Robot 84457a0dac CMake Nightly Date Stamp 2018-10-03 00:01:07 -04:00
Brad King 6d28884617 cmCTestRunTest: Avoid float/int conversions in number width logic
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.
2018-10-02 15:40:29 -04:00
Brad King 7787fb6e3e Merge branch 'fix-csharp-target-type' into release-3.12
Merge-request: !2427
2018-10-02 14:58:57 -04:00
Brad King 375b420fdf CSharp: Fix regression in VS project type selection
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
2018-10-02 14:58:11 -04:00
Brad King 8b21aa0af0 VS: Fix CSharp flag selection when linking to a static C++ library
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
2018-10-02 14:58:11 -04:00
Brad King 4ca8cb2868 Merge topic 'csharp_versions'
94c406eb49 VS: Update CSharp flag table to support new language versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2425
2018-10-02 08:56:32 -04:00
Brad King 9682fa79e7 Merge topic 'install-directory-permissions-fix'
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
2018-10-02 08:55:15 -04:00
Marc Chevrier 63c9356544 FindPython*: fix erroneous handling of virtual environments
fixes: #18408
2018-10-02 11:09:45 +02:00
Kitware Robot 44de342859 CMake Nightly Date Stamp 2018-10-02 00:01:07 -04:00
Kyle Edwards 5e61b79b82 install: Set permissions on directories created by install(DIRECTORY)
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.
2018-10-01 16:28:43 -04:00