summaryrefslogtreecommitdiff
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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 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' 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
| * | | | FindODBC: Add library name for MinGW toolchainsCristian Adam2019-11-251-0/+2
| | | | | | | | | | | | | | | | | | | | Fixes: #20018
* | | | | 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
* | | | 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
| * | | Swift: support `-rpath` on DarwinSaleem Abdulrasool2019-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Darwin also has the concept of RPATH. Additionally, the flag is identical to that on other Unixish platforms. Simply avoid the `-rpath` handling on Windows. This enables the use of `BUILD_WITH_INSTALL_RPATH` and `INSTALL_RPATH` with Swift targets on Darwin.
* | | | 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
| * | | | Swift: support `INSTALL_NAME_DIR` on DarwinSaleem Abdulrasool2019-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust the shared object rule to ensure that we honour the `INSTALL_NAME_DIR` property on Swift targets. This enables the use of `INSTALL_NAME_DIR` and `BUILD_WITH_INSTALL_NAME_DIR` on Darwin with Ninja.
* | | | | 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
| * | | | | FindPostgreSQL: also search for libraries in the MacPorts suffixBen Boeckel2019-11-131-0/+1
| |/ / / /
* | | | | 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
| * | | | | FindwxWidgets: Add link dependencies for MinGWGrant Kim2019-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | wxWidgets on MinGW requires system libraries `uuid` and `uxtheme`.
* | | | | | 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
| * | | | FindwxWidgets: Add support for wxQtCraig Sturdy2019-11-121-22/+26
| |/ / /
* | | | Merge topic 'swift-rpath-separator' into release-3.16Brad King2019-11-131-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a27a1c7e88 Swift: Allow build and installed RPATHs to differ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4037
| * | | | Swift: Allow build and installed RPATHs to differSaleem Abdulrasool2019-11-121-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | Define the RPATH separator to `:` so that CMake can reserve room to edit the ELF RPATH at install time. This enables the use of `BUILD_RPATH` and `INSTALL_RPATH` with differing values.
* | | | Merge topic 'remove-CPACK_INSTALL_CMAKE_CONFIGURATIONS' into release-3.16Craig Scott2019-11-121-7/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1d1fa5d3e4 Tests: Add RunCMake.CPackCommandLine case for multi-config package 108207cc84 CPack: Remove CPACK_INSTALL_CMAKE_CONFIGURATIONS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4025
| * | | | CPack: Remove CPACK_INSTALL_CMAKE_CONFIGURATIONSAlex Turbov2019-11-111-7/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit da5ac4bb60 (cpack: Add `CPACK_INSTALL_CMAKE_CONFIGURATIONS` variable, 2019-07-10, v3.16.0-rc1~165^2) we added both the variable and support for `cpack -C` with multiple configurations. Drop the variable because the `package` target cannot ensure that all of the configurations are built. Keep the command-line interface so that it can be used manually in scripts. Fixes: #19918
* | | | Merge topic 'objc-link-main' into release-3.16Brad King2019-11-111-50/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db91c5f776 ObjC: Set same settings for all languages supported on Darwin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4012
| * | | | ObjC: Set same settings for all languages supported on DarwinCristian Adam2019-11-081-50/+26
| | | | | | | | | | | | | | | | | | | | Fixes: #19928
* | | | | Merge topic 'CTestCoverageCollectGCOV-typo' into release-3.16Brad King2019-11-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7d9c5e78b CTestCoverageCollectGCOV: Fix typo in ctest_coverage_collect_gcov docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4016
| * | | | | CTestCoverageCollectGCOV: Fix typo in ctest_coverage_collect_gcov docsBrad King2019-11-081-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Docs added by commit f3e0b6f1eb (CTestCoverageCollectGCOV: Add module to run gcov, 2015-01-14, v3.2.0-rc1~79^2) accidentally called the function `cdash_coverage_collect_gcov`. Rename `cdash` to `ctest`.
* | | | | Merge topic 'revert-FindBinUtils-ask-compiler' into release-3.16Brad King2019-11-082-75/+21
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | b2857514b0 FindBinUtils: Revert "Use the compiler to get the path to compiler tools" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4009
| * | | | FindBinUtils: Revert "Use the compiler to get the path to compiler tools"Brad King2019-11-072-75/+21
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit b2fd479df5 (FindBinUtils: Use the compiler to get the path to compiler tools, 2019-09-22, v3.16.0-rc1~51^2). The compiler's answer may incorrectly come from the `PATH`. Another approach will be needed. Fixes: #19934
* | | | Merge topic 'objc-x-objc' into release-3.16Brad King2019-11-072-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a7b4f47aa ObjC: Mark explicitly the language for compilation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4002
| * | | | ObjC: Mark explicitly the language for compilationCristian Adam2019-11-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way you can have .cpp files compiled as ObjC++. Fixes: #19926
* | | | | Merge topic 'FindBoost-meta-component-ALL' into release-3.16Brad King2019-11-061-0/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 77a01c398f FindBoost: Prevent warning due to new meta-component "ALL" of Boost 1.73 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3996
| * | | | FindBoost: Prevent warning due to new meta-component "ALL" of Boost 1.73Deniz Bahadir2019-11-051-0/+3
| |/ / /
* | | | Merge topic 'doc-discourse' into release-3.16Craig Scott2019-11-061-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4af39fe25b CMakeSystemSpecificInformation: Replace mailing list with Discourse Forum d0be4d5365 README: Replace link to mailing list the CMake Discourse Forum 4dd6ad20b6 README: Update links to cmake.org pages 821bfca89b Help: Replace links to mailing lists with links to our Discourse Forum 32d8de1463 CMakeCPack: Update Debian package contact email 2fae9101e5 Help/dev: Update maintainer guide for Discourse transition Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3998
| * | | | CMakeSystemSpecificInformation: Replace mailing list with Discourse ForumBrad King2019-11-061-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | On unknown platforms we issue a message instructing users to post to our mailing list to add support for the platform. Refer them to the CMake Discourse Forum instead.
* | | | Merge branch 'findpostgres-10-and-older' into release-3.16Brad King2019-11-051-5/+16
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3993
| * | | | FindPostgreSQL: support version encoding used in pre-10 releasesBen Boeckel2019-11-041-5/+16
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the 10.x release, PostgreSQL upstream started encoding the version as `MMmmmm` where `M` is major and `m` is minor. Prior to that, `MMmmPP` was used where `P` was the patch number. Detect this difference and decode it based on the used encoding. Fixes: #19912
* | | | Merge branch 'objc-pch' into release-3.16Brad King2019-11-052-3/+2
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3983
| * | | | PCH: Add support for OBJC/OBJCXX languagesCristian Adam2019-11-032-3/+2
| |/ / /
* | | | FindwxWidgets: Add support for 3.1.3 VS binariesTomasz Słodkowicz2019-11-011-0/+10
|/ / /
* | | Merge branch 'swift-rpath' into release-3.16Brad King2019-10-311-0/+4
|\ \ \ | | | | | | | | | | | | Merge-request: !3965
| * | | Swift: support `BUILD_RPATH` propertiesSaleem Abdulrasool2019-10-301-0/+4
| | | | | | | | | | | | | | | | | | | | Enable passing a RPATH to Swift shared libraries. This enables testing libraries before they have been installed.
* | | | Merge branch 'docs-CMakePrintHelpers-typo' into release-3.16Craig Scott2019-10-311-2/+2
|\ \ \ \ | | | | | | | | | | Merge-request: !3966
| * | | | Help: Fix minor typo in CMakePrintHelpers module docsCraig Scott2019-10-311-2/+2
| |/ / / | | | | | | | | Fixes: #19900
* | | | Merge branch 'sdk-on-mac' into release-3.16Brad King2019-10-281-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3957
| * | | | Swift: Honor CMAKE_OSX_SYSROOT on Apple platformsBrad King2019-10-281-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the value to the Swift compiler driver via `-sdk`. We already do this for C/C++ via `-isysroot`. This fixes command-line builds on macOS 10.15 with Xcode 11 Swift tools. Fixes: #19880
* | | | Merge branch 'FindCurses-formw' into release-3.16Brad King2019-10-281-3/+5
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3947
| * | | | FindCurses: use formw when wide support is requestednick black2019-10-281-3/+5
| |/ / / | | | | | | | | | | | | Fixes: #19883
* | | | Merge branch 'swift-parallel-jobs' into release-3.16Brad King2019-10-281-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3950
| * | | | Swift: correct flags for parallel jobsSaleem Abdulrasool2019-10-281-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | `-num-threads` is for the threading, not the job control. Use `-j` to launch the parallel jobs. This enables parallel builds for Swift again after driver updates preventing the parallelization through `-num-threads`.
* | | | Merge branch 'docs-FindPython-minor-grammar' into release-3.16Craig Scott2019-10-283-6/+6
|\ \ \ \ | | | | | | | | | | Merge-request: !3953