summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* DeployQt4: Do not include BundleUtilities at configure timeKyle Edwards2018-10-192-71/+86
| | | | | | | | | | | | Due to CMP0080, BundleUtilities can no longer be included at configure-time. However, DeployQt4 contains some functions which are meant to be used at configure-time, and some which are meant to be used at install-time and use BundleUtilities. This change breaks the file into two sections: common functions and install-time functions. BundleUtilities is now only included at install-time, thus fixing the policy warning. Fixes: #18466
* DeployQt4: Convert to 2-space indentationKyle Edwards2018-10-181-259/+259
|
* Help: Convert DeployQt4 to block-style commentKyle Edwards2018-10-181-100/+101
|
* Merge branch 'FindPkgConfig-operator-docs' into release-3.13Brad King2018-10-151-6/+9
|\ | | | | | | Merge-request: !2481
| * FindPkgConfig: Document support for > and < operatorsCraig Scott2018-10-151-6/+9
| | | | | | | | | | This was left out of commit v3.13.0-rc1~14^2 (FindPkgConfig: support also > and < operators for version compares, 2018-10-02).
* | Merge branch 'FindBoost-mt-release' into release-3.13Brad King2018-10-111-0/+1
|\ \ | | | | | | | | | Merge-request: !2475
| * | FindBoost: Search for -mt variant of release libsMario Bielert2018-10-111-0/+1
| | | | | | | | | | | | | | | We were searching the `-mt` variant for debug libs only. It makes sense for release libs too.
* | | Merge branch 'FindPython-updates' into release-3.13Brad King2018-10-112-2/+77
|\ \ \ | | | | | | | | | | | | Merge-request: !2476
| * | | FindPython*: Add missing registry pathsMarc Chevrier2018-10-112-2/+77
| |/ / | | | | | | | | | Fixes: #18443
* | | Merge branch 'FindBISON-fix-verbose-file' into release-3.13Brad King2018-10-091-7/+14
|\ \ \ | | | | | | | | | | | | Merge-request: !2467
| * | | FindBISON: Fix "multiple rules generate" error on VERBOSE outputBrad King2018-10-091-7/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'mkl_ilp64' into release-3.13Brad King2018-10-092-21/+37
|\ \ \ | | | | | | | | | | | | Merge-request: !2444
| * | | Find{BLAS,LAPACK}: Find also ILP64 MKL BLAS and LAPACKJakub Benda2018-10-082-21/+37
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | 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 'FindDoxygen-CMP0057' into release-3.12Brad King2018-09-111-0/+5
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2373
* | \ \ \ 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 'pkgc-op-lt-gt' into release-3.13Brad King2018-10-041-1/+3
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | Merge-request: !2435
| * | | | FindPkgConfig: support also > and < operators for version comparesRolf Eike Beer2018-10-041-1/+3
| |/ / / | | | | | | | | | | | | Fixes: #18416
* | | | Merge branch 'misc-typos' into release-3.13Brad King2018-10-043-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !2440
| * | | | Fix misc. typosluz.paz2018-10-033-6/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ```
* | | | 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
* | | 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
| | | |
* | | | FindPython*: fix erroneous handling of virtual environmentsMarc Chevrier2018-10-024-11/+33
|/ / / | | | | | | | | | fixes: #18408
* | | Merge topic 'asm-path-from-c'Brad King2018-09-271-4/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7ab5843c26 ASM: Search for full path even when using C or C++ compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2418
| * | | ASM: Search for full path even when using C or C++ compilerRaul Laasner2018-09-261-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge topic 'FindMatlab-2018b'Brad King2018-09-271-0/+78
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | FindMatlab: Add Matlab 2018a,b to version listSean Warren2018-09-261-0/+2
| | | |
| * | | FindMatlab: Explicitly export mexFunction in MSVCSean Warren2018-09-261-0/+14
| | | | | | | | | | | | | | | | Fixes: #18391
| * | | FindMatlab: Optionally allow linking to MatlabEngine and MatlabDataArraySean Warren2018-09-261-0/+62
| | | | | | | | | | | | | | | | Fixes: #17971
* | | | Merge topic 'FindLua-names-per-dir'Brad King2018-09-261-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | FindLua: Search for all library names in each pathBrad King2018-09-251-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge topic 'FindGLUT-windows-debug'Brad King2018-09-261-9/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0da645d452 FindGLUT: Find debug/release variants on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2398
| * | | | FindGLUT: Find debug/release variants on WindowsKohányi Róbert2018-09-251-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | Merge topic 'dbgsym-packaging'Brad King2018-09-261-7/+99
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | CPack/Deb: Add ability to split out debug symbols into .ddeb packageAndrew Fuller2018-09-211-4/+96
| | | | |
| * | | | CPack/Deb: Use CMAKE_COMMAND to set the environmentAndrew Fuller2018-09-181-3/+3
| | | | |
* | | | | Merge topic 'bundleutilities-policy'Brad King2018-09-201-217/+236
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | BundleUtilities: Disallow inclusion at configure timeKyle Edwards2018-09-191-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | Help: Add note for BundleUtilities usageKyle Edwards2018-09-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The macros defined in BundleUtilities are intended to be used from an install() rule rather than at configure time. Add a note clarifying this.
| * | | | | Help: Convert BundleUtilities help to block-style commentKyle Edwards2018-09-191-217/+218
| | | | | |
* | | | | | Merge topic 'FindCUDA-filter-compute-capabilities'Brad King2018-09-201-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bfd93b73a0 FindCUDA: Filter unrelated content in compute capabilities output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2400
| * | | | | | FindCUDA: Filter unrelated content in compute capabilities outputSoumith Chintala2018-09-191-0/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge topic 'FindCUDA-ccbin-env'Brad King2018-09-201-1/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8085799ce3 FindCUDA: Add option to set CUDA_HOST_COMPILER via environment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2391
| * | | | | FindCUDA: Add option to set CUDA_HOST_COMPILER via environmentpeterjc1232018-09-181-1/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | Re-use the `CUDAHOSTCXX` environment variable from the first-class CUDA language support to specify the host compiler for FindCUDA.