summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'compiler-launcher-env'Brad King2019-12-094-0/+20
|\ | | | | | | | | | | | | 6f48c59257 launcher: support setting a compiler launcher through the environment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4095
| * launcher: support setting a compiler launcher through the environmentBen Boeckel2019-12-054-0/+20
| | | | | | | | | | | | This makes it much easier to use a launcher for all CMake projects in an environment rather than having to remember to pass the setting to every CMake build.
* | Merge topic 'libarchive-target'Kyle Edwards2019-12-091-0/+15
|\ \ | | | | | | | | | | | | | | | | | | 30488b3b9f FindLibArchive: create a target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4117
| * | FindLibArchive: create a targetT.J. Corona2019-12-051-0/+15
| | |
* | | Merge topic 'vs-clangcl-toolset'Brad King2019-12-061-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 3c125c6de0 VS: Support Visual Studio Clang Toolkit identification Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4111
| * | VS: Support Visual Studio Clang Toolkit identificationJustin Goshi2019-12-051-1/+1
| |/ | | | | | | | | Teach CMake that the `ClangCl` toolset uses the `ClangClExecutable` value as the path to the compiler executable.
* | Merge topic 'FindPkgConfig-cross-compile'Brad King2019-12-051-1/+1
|\ \ | | | | | | | | | | | | | | | | | | f92a4b2399 FindPkgConfig: Fix path manipulations when cross compiling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4106
| * | FindPkgConfig: Fix path manipulations when cross compilingHugo Beauzée-Luyssen2019-12-021-1/+1
| |/ | | | | | | | | | | When cross compiling from a unix machine, if(UNIX) is false, whih causes the path not to be fixed for unix, leading to false negative if PKG_CONFIG_PATH needs to be probed
* | Merge topic 'FindBLAS-atlas-static'Brad King2019-12-051-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 85f4d580c9 FindBLAS: Search for libblas from ATLAS vendor Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4105
| * | FindBLAS: Search for libblas from ATLAS vendorEisuke Kawashima2019-12-041-1/+1
| |/ | | | | | | | | | | | | Symbols such as `cblas_ccopy` are defined in `libblas.a` but NOT IN `libf77blas.a`. Fixes: #14320
* | Merge topic 'FindPNG-static-dep-m'Brad King2019-12-051-0/+10
|\ \ | | | | | | | | | | | | | | | | | | ad41c98cbb FindPNG: add 'm' dependencies to static lib on Linux Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4096
| * | FindPNG: add 'm' dependencies to static lib on LinuxDavid Callu2019-11-281-0/+10
| |/
* | Merge topic 'FindThreads-lib-flag'Brad King2019-12-051-4/+4
|\ \ | | | | | | | | | | | | | | | | | | f7ffefea7c FindThreads: Restore hard-coded '-l' flag on library name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4112
| * | FindThreads: Restore hard-coded '-l' flag on library nameBrad King2019-12-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Revert commit de5f123d3a (FindThreads: Do not hard-code '-l' flag on library name, 2019-09-23, v3.16.0-rc1~71^2). Some clients depend on the value of `CMAKE_THREAD_LIBS_INIT` to contain a valid flag. Fixes: #20061, #20065
* | | Merge topic 'pch-xcode-no-warning'Brad King2019-12-052-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | df8372da09 PCH: Do not add #pragma system_header for Xcode generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4098
| * | | PCH: Do not add #pragma system_header for Xcode generatorCristian Adam2019-12-042-2/+6
| |/ / | | | | | | | | | Fixes: #20039
| * | Merge topic 'implicit-includes-extra-CR' into release-3.16Brad King2019-11-261-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d84afc7f2 Merge branch 'backport-implicit-includes-extra-CR' into implicit-includes-extra-CR 4b46523d90 CMakeParseImplicitIncludeInfo: Remove all CR chars from compiler output 2a5e5b25ba CMake 3.15.5 08173075c1 Merge branch 'doc-genex-tweak' into release-3.15 83dbef1135 Merge branch 'InstallRequiredSystemLibraries-redist' into release-3.15 881bca249d Merge branch 'vs-v142-csharp-flags' into release-3.15 dec3e9363e Merge branch 'backport-vs-16.4-global-targets' into release-3.15 ac1a1bf18b VS: Tell VS 16.4 not to verify CMake-provided custom command outputs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4088
| * \ \ Merge topic 'FindODBC-mingw' into release-3.16Brad King2019-11-261-0/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb8042b0ab FindODBC: Add library name for MinGW toolchains Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4076
* | \ \ \ Merge topic 'ninja-tool'Brad King2019-12-041-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feb5cb8d9d Ninja: Prefer first ninja tool available in PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4091
| * | | | | Ninja: Prefer first ninja tool available in PATHBrad King2019-11-261-0/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We search for tools `ninja-build`, `ninja`, and `samu` as the build tool for the Ninja generator. Re-order the search to prefer whichever tool appears first in the `PATH`. This makes it easier for users to control which tool gets used when more than one is available. Fixes: #20028
* | | | | Merge topic 'cuda_lang_specifies_cmake_library_arch'Brad King2019-12-041-0/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 974220b714 CUDA: persist CMAKE_LIBRARY_ARCHITECTURE and CUDA version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4090
| * | | | CUDA: persist CMAKE_LIBRARY_ARCHITECTURE and CUDA versionRobert Maynard2019-11-261-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CUDA language failed to persist CMAKE_CUDA_LIBRARY_ARCHITECTURE and CMAKE_LIBRARY_ARCHITECTURE, causing find_ calls to fail when the only enabled language was CUDA.
* | | | | Merge topic 'xlf-ninja'Brad King2019-11-265-0/+49
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19f267c75e XL: Add support for Ninja and XL Fortran Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4075
| * | | | | XL: Add support for Ninja and XL FortranBrad King2019-11-215-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Ninja generator's support for Fortran requires that source files be preprocessed explicitly first. However, the `xlf` compiler does not have a simple `-E` option or equivalent to do preprocessing. The only documented way to get preprocessed output is to use `-d` to leave it behind, but only at an inflexible location. Instead, create our own `cpp` wrapper script and substitute it for the real preprocessor using `-tF -B ...`. Teach the wrapper to map the `cpp` output to the location we need and then invoke the real `cpp` underneath. Fixes: #19450
* | | | | | Merge topic 'implicit-includes-extra-CR'Brad King2019-11-261-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d84afc7f2 Merge branch 'backport-implicit-includes-extra-CR' into implicit-includes-extra-CR 4b46523d90 CMakeParseImplicitIncludeInfo: Remove all CR chars from compiler output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4088
| * | | | | Merge branch 'backport-implicit-includes-extra-CR' into ↵Brad King2019-11-261-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | implicit-includes-extra-CR
| | * | | | | CMakeParseImplicitIncludeInfo: Remove all CR chars from compiler outputBrad King2019-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With Clang/LLVM on MinGW, lines ending in `\r\r\n` have been observed. Filter out all `\r` characters from these line endings. Fixes: #20021
| | * | | | | Merge branch 'InstallRequiredSystemLibraries-redist' into release-3.15Brad King2019-10-111-0/+7
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3909
* | | \ \ \ \ \ Merge topic 'FindODBC-mingw'Brad King2019-11-261-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | cb8042b0ab FindODBC: Add library name for MinGW toolchains Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4076
| * | | | | | FindODBC: Add library name for MinGW toolchainsCristian Adam2019-11-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20018
* | | | | | | Merge topic 'FindwxWidgets-rel-and-dbg'Brad King2019-11-251-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | a5bb08a8c0 FindwxWidgets: Fix finding both release and debug libs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4079
| * | | | | FindwxWidgets: Fix finding both release and debug libsBrad King2019-11-221-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit fe54989fcd (FindwxWidgets: Add support for wxQt, 2019-11-12, v3.16.0-rc4~12^2~1) the internal `WX_FIND_LIBS` macro gained an argument but not all call sites were updated. Update the missing one now. Fixes: #20005
* | | | | Merge topic 'FindMPI-improve-error'Brad King2019-11-211-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e221039e11 FindMPI: Improve error when a component's language is not enabled Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4071
| * | | | | FindMPI: Improve error when a component's language is not enabledKeith Ballard2019-11-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if a CMake project requests a component for a language that is not enabled, it would simply give an error with the message Could NOT find MPI (missing: MPI_${LANG}_FOUND) which is not indicative that the language was not enabled. This change provides an error message indicating that it failed to find the particular MPI component because no compiler was available for the language and the language might need to be enabled for the project. Closes: #19996
* | | | | | Merge topic 'UseJava-javadoc-classpath-separator'Brad King2019-11-211-43/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d47b97a69 UseJava: Use correct path separator in javadoc 1b27ac78ac UseJava: Use list(APPEND) to simplify javadoc option construction c7a4b1a58e UseJava: Extract the path separator to module level Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3967
| * | | | | | UseJava: Use correct path separator in javadocNathan Burles2019-11-201-20/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For both classpath and sourcepath.
| * | | | | | UseJava: Use list(APPEND) to simplify javadoc option constructionNathan Burles2019-11-201-10/+11
| | | | | | |
| * | | | | | UseJava: Extract the path separator to module levelNathan Burles2019-11-201-15/+10
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | It is currently only defined within the add_jar function, but is needed inside other functions in this module.
* | | | | | Merge topic 'ExternalProject-list-sep-in-cache'Brad King2019-11-211-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 46de38dae2 ExternalProject: replace LIST_SEPARATOR in initial cache files too Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4070
| * | | | | | ExternalProject: replace LIST_SEPARATOR in initial cache files tooBen Boeckel2019-11-201-0/+5
| |/ / / / /
* | | | | | Merge topic 'FindwxWidgets-qt-debug'Brad King2019-11-211-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | 84408ff402 FindwxWidgets: Find wxQt debug libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4069
| * | | | FindwxWidgets: Find wxQt debug librariesCraig Sturdy2019-11-201-0/+2
| |/ / / | | | | | | | | | | | | | | | | Extend the change from commit fe54989fcd (FindwxWidgets: Add support for wxQt, 2019-11-12, v3.16.0-rc4~12^2~1) to also find debug-enabled libs.
| * | | Merge topic 'swift-rpath-darwin' into release-3.16Brad King2019-11-181-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff6c336127 Swift: support `-rpath` on Darwin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4059
| * \ \ \ Merge topic 'swift-darwin-install-name' into release-3.16Brad King2019-11-181-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f935de6746 Swift: support `INSTALL_NAME_DIR` on Darwin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4060
| * \ \ \ \ Merge topic 'FindPostgreSQL-macports-libsuffix' into release-3.16Brad King2019-11-151-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24ae45fb0c FindPostgreSQL: also search for libraries in the MacPorts suffix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4043
| * \ \ \ \ \ Merge topic 'FindwxWidgets-mingw' into release-3.16Brad King2019-11-131-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c921ec6112 FindwxWidgets: Add link dependencies for MinGW Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4040
| * \ \ \ \ \ \ Merge topic 'FindwxWidgets-qt' into release-3.16Brad King2019-11-131-22/+26
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe54989fcd FindwxWidgets: Add support for wxQt Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4038
* | \ \ \ \ \ \ \ Merge topic 'sdcc-sdar'Brad King2019-11-191-10/+24
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5cf404d36f SDCC compiler: use sdar instead of sdcclib as librarian for recent versions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4065
| * | | | | | | | | SDCC compiler: use sdar instead of sdcclib as librarian for recent versionsJohnny Jazeix2019-11-181-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19988
* | | | | | | | | | Merge topic 'FindFLEX-work-dir'Brad King2019-11-191-19/+54
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c5fb36a4cb FindFLEX: Add policy CMP0098 to run flex in build tree Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3981