mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-09 01:09:30 -05:00
Code Issues Packages Projects Releases Wiki Activity
40,774 Commits 2 Branches 392 Tags
efa5d5c781abb92e3a634541e89a72b0a520c65f
Commit Graph

40774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
efa5d5c781 Merge branch 'doc-regex-backslash' into release-3.13 
Merge-request: !2460
 2018-10-09 06:34:34 -04:00
Brad King
fab2c2339b Help: Fix documentation of escape sequences in a regex 
Documentation added by commit 4b35dab891 (Help: Document how escape
sequences work in a regex, 2018-07-18) is only correct for backslashes
inside `[]` groups.  The regex engine does interpret `\` escapes
elsewhere.  Fix the docs.

Inspired-by: R2RT <artur.ryt@gmail.com>
Fixes: #18428
 2018-10-09 06:31:37 -04:00
Brad King
92ed3b38cc Merge branch 'vs-flag-map-Qspectre' into release-3.13 
Merge-request: !2462
 2018-10-09 06:28:57 -04:00
Brad King
0e2799019f Merge branch 'mkl_ilp64' into release-3.13 
Merge-request: !2444
 2018-10-09 06:28:49 -04:00
Brad King
bb60ed6e72 VS: Add flag table entry for -Qspectre 
Add special logic to map this flag to a top-level build setting
instead of being in ClCompile.

Fixes: #18426
 2018-10-08 14:03:39 -04:00
Jakub Benda
d0fb3e6c52 Find{BLAS,LAPACK}: Find also ILP64 MKL BLAS and LAPACK 
Modern Intel MKL packages offer 64-bit BLAS and LAPACK libraries in any
of the eight combinations of the following three binary options:

  - sequential or threaded
  - LP64 or ILP64
  - static or shared

The modules FindBLAS and FindLAPACK did not allow full selection of
arbitrary combination; in particular, only LP64 variant was used.

The original list of possible BLA_VENDOR values related to MKL,

  Intel10_64lp
  Intel10_64lp_seq

is thus extended by another pair of "vendors",

  Intel10_64ilp
  Intel10_64ilp_seq

Depending on the selection, either "_lp64", or "_ilp64" MKL libraries
are searched for. Some comments in the two CMake modules were modified
to indicate that even though the "vendors" contain the number "10",
they also apply to all further versions of MKL.
 2018-10-08 13:21:08 -04:00
Brad King
c268fcc2ed Merge branch 'doc-target_link_libraries-keywords-not-genex' into release-3.13 
Merge-request: !2449
 2018-10-08 11:52:39 -04:00
Brad King
c2356d60d8 Merge branch 'project-always-set-desc-url' into release-3.13 
Merge-request: !2457
 2018-10-08 11:21:48 -04:00
Brad King
981cdceca2 Merge branch 'add_ctest_progress_docs' into release-3.13 
Merge-request: !2454
 2018-10-08 11:21:36 -04:00
Brad King
bad9bc78e3 Merge branch 'list-SORT-docs' into release-3.13 
Merge-request: !2453
 2018-10-08 11:21:23 -04:00
Brad King
cd8c79e163 Help: Clarify target_link_libraries keywords and generator expressions 
The `optimized` and `debug` keyword items are meaningful only to
the `target_link_libraries` command and have no meaning when
produced by a generator expression.  State this explicitly.
Also recommend use of a quoted argument when the genex itself
may contain a semicolon.

Fixes: #18424
 2018-10-08 11:18:14 -04:00
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
Craig Scott
f8a086a86b project(): Ensure DESCRIPTION and HOMEPAGE_URL variables are set 
If a project() call does not have DESCRIPTION or HOMEPAGE_URL
options, it must still set the relevant variables or else those variables will
inherit values from an earlier project() call. That is inconsistent with how
VERSION is handled and is likely to be unexpected. The docs were also
ambiguous about what should happen in such cases.
 2018-10-08 08:28:17 +11:00
Craig Scott
b27247c8df project(): Add tests verifying variables set by second project() call 2018-10-08 08:28:01 +11:00
Craig Scott
2154ea38f9 Help: Add missing docs for the ctest --progress option 
These docs were missing from the changes that introduced the feature in
!2240.
 2018-10-07 17:03:36 +11:00
Craig Scott
fb2cdf4d4c Help: Use :envvar: links for env vars affecting ctest command 2018-10-07 17:03:36 +11:00
Craig Scott
cdf8d79e9f Help: Improve/fix incorrect docs for list(SORT) sub-options 2018-10-06 18:10:38 +10: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