summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* FindBoost: Add explicit Boost_ARCHITECTURE optionBrad King2018-11-051-19/+30
| | | | | | | | | | | Boost 1.66 and above built with `--layout=versioned` add an architecture tag to the library file names. We already try to compute this tag automatically when `CMAKE_CXX_COMPILER_ARCHITECTURE_ID` is available, but that is currently not computed everywhere. Add an explicit `Boost_ARCHITECTURE` option that a user can set to specify the architecture tag. Issue: #17701
* Merge branch 'FindBoost-stacktrace' into release-3.13Brad King2018-10-291-0/+6
|\ | | | | | | Merge-request: !2541
| * FindBoost: Add support for stacktrace componentsMartin Quinson2018-10-291-0/+6
| | | | | | | | | | | | Define the headers associated to `boost_stacktrace_*`. Fixes: #17297
* | Merge branch 'flang-preprocess-source' into release-3.13Brad King2018-10-291-1/+1
|\ \ | | | | | | | | | Merge-request: !2545
| * | Flang: Fix command-line used to preprocess sourcesBrad King2018-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Running flang with `-E` now ignores any `-o` option and always prints preprocessed output to stdout. Use shell redirection to place it in a file instead. Fixes: #18497
* | | Merge branch 'qccDepfile' into release-3.13Brad King2018-10-291-1/+1
|\ \ \ | | | | | | | | | | | | Merge-request: !2540
| * | | QNX: Update qcc depfile flags to be compliant with ccacheMaikel van den Hurk2018-10-291-1/+1
| |/ / | | | | | | | | | | | | Pass the flags to the preprocessor phase via `-Wp,`. This is accepted both by qcc and ccache.
* | | Merge branch 'UseSWIG-multi-input' into release-3.13Brad King2018-10-292-2/+40
|\ \ \ | | | | | | | | | | | | Merge-request: !2539
| * | | UseSWIG: multiple input files must be supported in version 2Marc Chevrier2018-10-292-2/+40
| | | | | | | | | | | | | | | | Fixes: #18506
* | | | Merge branch 'FindMPI-pthread-cuda' into release-3.13Brad King2018-10-251-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !2529
| * | | | FindMPI: Pass -pthread to CUDA compiler through -XcompilerBrad King2018-10-251-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When adding this flag to imported targets, wrap it in a generator expression to use `-Xcompiler` to pass the flag for CUDA. Fixes: #17929
* | | | | Merge branch 'FindBoost-1.69' into release-3.13Brad King2018-10-251-14/+29
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | Merge-request: !2522
| * | | FindBoost: Add support for upcoming Boost 1.69Mateusz Łoskot2018-10-251-14/+29
| | |/ | |/| | | | | | | This makes the module usable with Boost from its current master.
* | | FindThreads: Pass -pthread to CUDA compiler through -XcompilerRolf Eike Beer2018-10-241-1/+3
| | | | | | | | | | | | Fixes: #18008
* | | Merge branch 'GNUInstallDirs-kfreebsd-man' into release-3.13Brad King2018-10-221-1/+1
|\ \ \ | | | | | | | | | | | | Merge-request: !2511
| * | | GNUInstallDirs: Don't use BSD info and man paths on GNU/kFreeBSDJames Clarke2018-10-221-1/+1
| |/ /
* | | 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