mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-01 04:03:24 +03:00
Code Activity
47,352 Commits 2 Branches 414 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph
10291 Commits
Author SHA1 Message Date
Frederik Gladhorn 84e7920b3a FindFontconfig: Add module to find Fontconfig 
This module is inspired by one from KDE's KWin.
 2018-10-18 20:32:09 +02:00
Frederik Gladhorn c88fb94978 FindLibinput: do not set Libinput_VERSION_STRING 
Libinput_VERSION is enough, this is redundant
 2018-10-18 20:30:32 +02:00
Kyle Edwards 65bea5b90b DeployQt4: Convert to 2-space indentation 2018-10-18 12:03:14 -04:00
Kyle Edwards 9bfb63bd42 Help: Convert DeployQt4 to block-style comment 2018-10-18 12:03:14 -04:00
Joachim Wuttke (l) 74b3eacdc7 Help: Use appropriate list types in FindPkgConfig 2018-10-17 23:50:22 +11:00
Frederik Gladhorn 0c20d4d67b FindLibinput: Use _COMPILE_OPTIONS instead of _DEFINITIONS 
The value may contain flags.
 2018-10-16 11:07:41 -04:00
Brad King 0c1622dca6 Merge topic 'FindPkgConfig-operator-docs' 
7f2bc70c5e FindPkgConfig: Document support for > and < operators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Rolf Eike Beer <eike@sf-mail.de>
Merge-request: !2481
 2018-10-15 13:03:17 -04:00
Brad King 01fae460be Merge branch 'FindPkgConfig-operator-docs' into release-3.13 
Merge-request: !2481
 2018-10-15 10:16:18 -04:00
Craig Scott 7f2bc70c5e FindPkgConfig: Document support for > and < operators 
This was left out of commit v3.13.0-rc1~14^2 (FindPkgConfig: support
also > and < operators for version compares, 2018-10-02).
 2018-10-15 10:14:51 -04:00
Brad King 1cfe2442c4 Merge topic 'find_libinput' 
f76047f34a FindLibinput: Add module to find libinput

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2420
 2018-10-12 08:15:25 -04:00
Brad King 02eb3c302a Merge topic 'FindPython-updates' 
e23c41ba78 FindPython*: Add missing registry paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2476
 2018-10-12 08:09:37 -04:00
Brad King e9eaf0f262 Merge topic 'FindBoost-mt-release' 
9c75922745 FindBoost: Search for -mt variant of release libs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2475
 2018-10-12 07:53:00 -04:00
Brad King 769fc9c4de Merge branch 'FindBoost-mt-release' into release-3.13 
Merge-request: !2475
 2018-10-11 14:18:49 -04:00
Mario Bielert 9c75922745 FindBoost: Search for -mt variant of release libs 
We were searching the `-mt` variant for debug libs only.
It makes sense for release libs too.
 2018-10-11 14:16:34 -04:00
Brad King c9b7cd8ed7 Merge branch 'FindPython-updates' into release-3.13 
Merge-request: !2476
 2018-10-11 14:14:01 -04:00
Marc Chevrier e23c41ba78 FindPython*: Add missing registry paths 
Fixes: #18443
 2018-10-11 14:13:31 -04:00
Frederik Gladhorn f76047f34a FindLibinput: Add module to find libinput 
This module is inspired by one from KDE's KWin.
 2018-10-11 10:43:45 -04:00
Brad King b7cba6ba00 Merge topic 'cmake_policy-get_warning' 
0d988f98e5 cmake_policy: Add undocumented GET_WARNING command
f9f96598df Help: Convert FindOpenGL documentation to block comment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2472
 2018-10-11 07:41:06 -04:00
Brad King 7a0f516ecd Merge topic 'FindwxWidgets-optional' 
045b0beae1 FindwxWidgets: implement detailed components status on Windows
0813581859 FindwxWidgets: honor OPTIONAL_COMPONENTS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2447
 2018-10-11 07:33:39 -04:00
Kyle Edwards 0d988f98e5 cmake_policy: Add undocumented GET_WARNING command 
This command is intended for modules that issue policy warnings so
they can get the warning string from CMake in a uniform manner,
rather than duplicating the string. Several modules been updated
to include an example of the usage of this new command.
 2018-10-10 10:56:00 -04:00
Kyle Edwards f9f96598df Help: Convert FindOpenGL documentation to block comment 2018-10-10 10:56:00 -04:00
Craig Scott 5dd16bc92c Merge topic 'module-index-restructure' 
dc372f6eef Help: Document Use_wxWindows.cmake as deprecated
846e3d2ceb Help: Reorganise module index into sections
c9cedd675b Help: Add link to cmake-qt(7) to FindQt.cmake.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2463
 2018-10-10 08:49:23 -04:00
Tomasz Słodkowicz 045b0beae1 FindwxWidgets: implement detailed components status on Windows 2018-10-10 08:45:56 +02:00
Craig Scott dc372f6eef Help: Document Use_wxWindows.cmake as deprecated 
The implementation already logged a message saying that the module
was deprecated. This change adds that message to the module docs.
 2018-10-09 17:13:52 +02:00
Brad King afd5d17bac Merge topic 'FindBISON-fix-verbose-file' 
c64797fa94 FindBISON: Fix "multiple rules generate" error on VERBOSE output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2467
 2018-10-09 09:03:10 -04:00
Brad King f6193d92fd Merge branch 'FindBISON-fix-verbose-file' into release-3.13 
Merge-request: !2467
 2018-10-09 09:01:21 -04:00
Brad King c64797fa94 FindBISON: Fix "multiple rules generate" error on VERBOSE output 
When `BISON_TARGET` is called with both

    VERBOSE <extra-file> REPORT_FILE <file>

we add a custom command to copy `<file>` to `<extra-file>`.  The change
in commit v3.7.1~10^2 (FindBISON: Do not rebuild every time when not
VERBOSE, 2016-11-14) incorrectly listed the extra file as an output of
the main bison invocation custom command, but it is actually produced by
the separate copy command.  Fix the logic to always generate `<file>` as
an output of the bison command and `<extra-file>` as an output of the
copy command.

Fixes: #18433
 2018-10-09 08:55:54 -04:00
Joachim Wuttke (l) c9cedd675b Help: Add link to cmake-qt(7) to FindQt.cmake. 2018-10-09 22:41:44 +11: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 424851742e Merge topic 'mkl_ilp64' 
d0fb3e6c52 Find{BLAS,LAPACK}: Find also ILP64 MKL BLAS and LAPACK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2444
 2018-10-09 06:27:55 -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 fcb47f4331 Merge topic 'UseSWIG-php-regression' 
ecd0fec40b UseSWIG: fix regression for PHP language

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2448
 2018-10-08 11:10:59 -04:00
Brad King 20e14baae7 Merge topic 'autogen-moc-predef-cross-compile' 
66f49d1f9a Android: Add clang --target= flag to compiler predefines command
39534c58c5 Autogen: Add clang --target= flag to compiler predefines command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: André Klitzing <aklitzing@gmail.com>
Merge-request: !2452
 2018-10-08 11:10:19 -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
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
Tomasz Słodkowicz 0813581859 FindwxWidgets: honor OPTIONAL_COMPONENTS 2018-10-04 23:52:30 +02:00
Brad King cf57c27150 Merge topic 'pkgc-op-lt-gt' 
aa51bfd74f FindPkgConfig: support also > and < operators for version compares

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2435
 2018-10-04 10:36:49 -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 5161714e1d Merge topic 'misc-typos' 
6b4c5a0365 Fix misc. typos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2440
 2018-10-04 10:11:39 -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 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
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