Commit Graph

8762 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Rolf Eike Beer
aa51bfd74f FindPkgConfig: support also > and < operators for version compares
Fixes: #18416
2018-10-04 10:32:13 -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
Marc Chevrier
63c9356544 FindPython*: fix erroneous handling of virtual environments
fixes: #18408
2018-10-02 11:09:45 +02:00
Brad King
3f7312a978 Merge topic 'asm-path-from-c'
7ab5843c26 ASM: Search for full path even when using C or C++ compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2418
2018-09-27 14:51:13 -04:00
Brad King
acf0627470 Merge topic 'FindMatlab-2018b'
62709beff8 FindMatlab: Add Matlab 2018a,b to version list
9a56ed3438 FindMatlab: Explicitly export mexFunction in MSVC
6c57f6b347 FindMatlab: Optionally allow linking to MatlabEngine and MatlabDataArray

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raffi Enficiaud <raffi.enficiaud@free.fr>
Merge-request: !2407
2018-09-27 14:48:03 -04:00
Raul Laasner
7ab5843c26 ASM: Search for full path even when using C or C++ compiler
When `CMAKE_{C,CXX}_COMPILER` is set but `CMAKE_ASM*_COMPILER` is
not, we copy the C or C++ compiler to use as the ASM compiler.
In this case we still need to search for the ASM compiler in case
the C or C++ compiler is not known as an absolute path.

Also do not copy the compiler id setting and let the normal detection
take place.  The C compiler id may not exist if the language has not
been enabled.

Fixes: #18406
2018-09-26 14:01:39 -04:00
Brad King
a57225c4fc Merge topic 'FindLua-names-per-dir'
98dfdab19c FindLua: Search for all library names in each path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Rolf Eike Beer <eike@sf-mail.de>
Merge-request: !2412
2018-09-26 10:07:01 -04:00
Brad King
c813785044 Merge topic 'FindGLUT-windows-debug'
0da645d452 FindGLUT: Find debug/release variants on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2398
2018-09-26 10:06:21 -04:00
Sean Warren
62709beff8 FindMatlab: Add Matlab 2018a,b to version list 2018-09-26 07:54:50 -04:00
Sean Warren
9a56ed3438 FindMatlab: Explicitly export mexFunction in MSVC
Fixes: #18391
2018-09-26 07:54:01 -04:00
Sean Warren
6c57f6b347 FindMatlab: Optionally allow linking to MatlabEngine and MatlabDataArray
Fixes: #17971
2018-09-26 07:53:50 -04:00
Brad King
b16b254845 Merge topic 'dbgsym-packaging'
d8a3939aef CPack/Deb: Add ability to split out debug symbols into .ddeb package
42fbff45e4 CPack/Deb: Use CMAKE_COMMAND to set the environment
66ab24a4c5 Help: Fix typo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2399
2018-09-26 06:52:06 -04:00
Brad King
98dfdab19c FindLua: Search for all library names in each path
Add the `NAMES_PER_DIR` option to our `find_library` call so that all
names are considered in each path as we proceed through the search.
This allows locally-built unversioned libraries to be found before
versioned system libraries if they appear earlier in the set of paths to
be searched.

Suggested-by: Alan W. Irwin <irwin@beluga.phys.uvic.ca>
2018-09-25 09:32:45 -04:00
Kohányi Róbert
0da645d452 FindGLUT: Find debug/release variants on Windows
* Separate find_library calls to find Release and Debug libs.
* Using select_library_configurations to properly populate required
  variables (similar to FindZLIB).
* Setting Release and Debug specific properties
  (IMPORTED_CONFIGURATIONS_<CONFIG> and IMPORTED_LOCATION_<CONFIG>).
* Falling back to setting just IMPORTED_LOCATION if
  GLUT_glut_LIBRARY_RELEASE or GLUT_glut_LIBRARY_DEBUG are not defined.

This enables proper linking on Windows.

Fixes: #17037
2018-09-25 09:00:54 -04:00
Andrew Fuller
d8a3939aef CPack/Deb: Add ability to split out debug symbols into .ddeb package 2018-09-21 20:19:31 +00:00
Brad King
3523990f7b Merge topic 'bundleutilities-policy'
b69159324a Help: Add release notes for new BundleUtilities policy
eedd91ab08 BundleUtilities: Disallow inclusion at configure time
fd28ea35ca Help: Add note for BundleUtilities usage
3925407e76 Help: Convert BundleUtilities help to block-style comment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2379
2018-09-20 09:38:04 -04:00
Brad King
22db0d5c6e Merge topic 'FindCUDA-filter-compute-capabilities'
bfd93b73a0 FindCUDA: Filter unrelated content in compute capabilities output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2400
2018-09-20 09:36:31 -04:00
Brad King
9964808108 Merge topic 'FindCUDA-ccbin-env'
8085799ce3 FindCUDA: Add option to set CUDA_HOST_COMPILER via environment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2391
2018-09-20 09:35:45 -04:00
Kyle Edwards
eedd91ab08 BundleUtilities: Disallow inclusion at configure time
This commit adds a new CMake policy, CMP0080, which prohibits the
inclusion of BundleUtilities at configure time. The old behavior is
to allow the inclusion.
2018-09-19 11:23:08 -04:00
Kyle Edwards
fd28ea35ca Help: Add note for BundleUtilities usage
The macros defined in BundleUtilities are intended to be used from
an install() rule rather than at configure time. Add a note clarifying
this.
2018-09-19 11:23:08 -04:00
Kyle Edwards
3925407e76 Help: Convert BundleUtilities help to block-style comment 2018-09-19 11:23:08 -04:00
Soumith Chintala
bfd93b73a0 FindCUDA: Filter unrelated content in compute capabilities output
Working around CUDA-level nvrm_gpu log statements to stdout on some
embedded platforms (ex. Drive PX2).

See-also: https://github.com/pytorch/pytorch/issues/11518#issue-359113249
2018-09-19 10:55:02 -04:00
Andrew Fuller
42fbff45e4 CPack/Deb: Use CMAKE_COMMAND to set the environment 2018-09-18 11:41:36 -07:00
peterjc123
8085799ce3 FindCUDA: Add option to set CUDA_HOST_COMPILER via environment
Re-use the `CUDAHOSTCXX` environment variable from the first-class
CUDA language support to specify the host compiler for FindCUDA.
2018-09-18 11:41:47 -04:00
Brad King
7162630bee Merge topic 'vs-ipo'
bef80e6623 VS: Do not specify incremental linking if LTCG is enabled
567fabe88e IPO: INTERPROCEDURAL_OPTIMIZATION (LTCG) for Visual Studio

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2363
2018-09-18 11:22:41 -04:00
Brad King
f9eac2ae4b Merge topic 'FindPython-updates'
329f6aeca5 FindPython*: Windows: add facility to select lookup order for registry.
ffb560adc9 FindPython*: MacOS: Fix erroneous handling of Frameworks.
b0b53921ce FindPython: clean-up lookup names strategy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2369
2018-09-18 11:15:13 -04:00
Niels Dekker
567fabe88e IPO: INTERPROCEDURAL_OPTIMIZATION (LTCG) for Visual Studio
Add IPO support for Visual Studio (which is referred to by VS as
"Link Time Code Generation" and "Whole Program Optimization"), for
VS version >= 10.  This allows CMake/VS users to enable IPO by setting
property `INTERPROCEDURAL_OPTIMIZATION`.

Fixes: #16748
2018-09-17 10:53:10 -04:00
Nikolaus Wittenstein
6209434b44 FindCUDA: Fix "alphabetical" typo 2018-09-14 14:53:03 -04:00
Brad King
88e6e35358 Merge topic 'module_policy_protection'
8ede35523e IN_LIST: Ensure policy allows if(IN_LIST) if used by a module
e549e31f79 CMakeIOSInstallCombined: Prevent policy leakage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2375
2018-09-14 13:23:10 -04:00
Brad King
cff5151822 Merge topic 'boost-notfound'
ee300dc25d FindBoost: Suppress imported targets warning if Boost was not found

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2376
2018-09-14 13:22:18 -04:00
Roger Leigh
ee300dc25d FindBoost: Suppress imported targets warning if Boost was not found
Fixes: #18330
2018-09-12 14:44:57 +01:00