Commit Graph

9805 Commits

Author SHA1 Message Date
Tobias Taschner
ada1824dc5 FindwxWidgets: Add support for 3.1.3 on macOS
Previously only -framework was used starting with 3.1.3 -weak_framework
might also be used and has to be handled.
2019-12-10 09:11:14 -05:00
Brad King
8db38cfe33 Merge topic 'implicit-includes-extra-CR' into release-3.16
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
2019-11-26 09:02:40 -05:00
Brad King
6d84afc7f2 Merge branch 'backport-implicit-includes-extra-CR' into implicit-includes-extra-CR 2019-11-26 09:00:38 -05:00
Brad King
0cb043390b Merge topic 'FindODBC-mingw' into release-3.16
cb8042b0ab FindODBC: Add library name for MinGW toolchains

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4076
2019-11-26 08:56:32 -05:00
Brad King
4b46523d90 CMakeParseImplicitIncludeInfo: Remove all CR chars from compiler output
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
2019-11-25 14:32:02 -05:00
Cristian Adam
cb8042b0ab FindODBC: Add library name for MinGW toolchains
Fixes: #20018
2019-11-25 13:55:51 -05:00
Brad King
a5bb08a8c0 FindwxWidgets: Fix finding both release and debug libs
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
2019-11-22 11:03:33 -05:00
Craig Sturdy
84408ff402 FindwxWidgets: Find wxQt debug libraries
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.
2019-11-20 10:06:15 -05:00
Brad King
3a87ce6c96 Merge topic 'swift-rpath-darwin' into release-3.16
ff6c336127 Swift: support `-rpath` on Darwin

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4059
2019-11-18 13:43:11 -05:00
Brad King
4bbd9e9ec4 Merge topic 'swift-darwin-install-name' into release-3.16
f935de6746 Swift: support `INSTALL_NAME_DIR` on Darwin

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4060
2019-11-18 13:42:08 -05:00
Saleem Abdulrasool
ff6c336127 Swift: support -rpath on Darwin
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.
2019-11-18 10:04:09 -05:00
Saleem Abdulrasool
f935de6746 Swift: support INSTALL_NAME_DIR on Darwin
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.
2019-11-18 10:02:50 -05:00
Brad King
25d7a72a93 Merge topic 'FindPostgreSQL-macports-libsuffix' into release-3.16
24ae45fb0c FindPostgreSQL: also search for libraries in the MacPorts suffix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4043
2019-11-15 09:01:36 -05:00
Brad King
842605341a Merge topic 'FindwxWidgets-mingw' into release-3.16
c921ec6112 FindwxWidgets: Add link dependencies for MinGW

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4040
2019-11-13 09:44:08 -05:00
Grant Kim
c921ec6112 FindwxWidgets: Add link dependencies for MinGW
wxWidgets on MinGW requires system libraries `uuid` and `uxtheme`.
2019-11-13 09:42:50 -05:00
Brad King
a0212382c9 Merge topic 'FindwxWidgets-qt' into release-3.16
fe54989fcd FindwxWidgets: Add support for wxQt

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4038
2019-11-13 09:38:48 -05:00
Brad King
a1216139f8 Merge topic 'swift-rpath-separator' into release-3.16
a27a1c7e88 Swift: Allow build and installed RPATHs to differ

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4037
2019-11-13 09:37:42 -05:00
Ben Boeckel
24ae45fb0c FindPostgreSQL: also search for libraries in the MacPorts suffix 2019-11-13 08:41:43 -05:00
Craig Sturdy
fe54989fcd FindwxWidgets: Add support for wxQt 2019-11-12 10:11:07 -05:00
Saleem Abdulrasool
a27a1c7e88 Swift: Allow build and installed RPATHs to differ
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.
2019-11-12 10:02:06 -05:00
Craig Scott
00f5e02060 Merge topic 'remove-CPACK_INSTALL_CMAKE_CONFIGURATIONS' into release-3.16
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
2019-11-12 08:16:31 -05:00
Alex Turbov
108207cc84 CPack: Remove CPACK_INSTALL_CMAKE_CONFIGURATIONS
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
2019-11-11 14:15:09 -05:00
Brad King
8bfd4447eb Merge topic 'objc-link-main' into release-3.16
db91c5f776 ObjC: Set same settings for all languages supported on Darwin

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4012
2019-11-11 10:24:02 -05:00
Brad King
929d7a454c Merge topic 'CTestCoverageCollectGCOV-typo' into release-3.16
a7d9c5e78b CTestCoverageCollectGCOV: Fix typo in ctest_coverage_collect_gcov docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4016
2019-11-08 14:04:17 -05:00
Brad King
a7d9c5e78b CTestCoverageCollectGCOV: Fix typo in ctest_coverage_collect_gcov docs
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`.
2019-11-08 11:04:32 -05:00
Brad King
0f1458022d Merge topic 'revert-FindBinUtils-ask-compiler' into release-3.16
b2857514b0 FindBinUtils: Revert "Use the compiler to get the path to compiler tools"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4009
2019-11-08 09:41:05 -05:00
Cristian Adam
db91c5f776 ObjC: Set same settings for all languages supported on Darwin
Fixes: #19928
2019-11-08 00:50:55 +01:00
Brad King
b2857514b0 FindBinUtils: Revert "Use the compiler to get the path to compiler tools"
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
2019-11-07 10:31:02 -05:00
Brad King
03e4fe65b0 Merge topic 'objc-x-objc' into release-3.16
9a7b4f47aa ObjC: Mark explicitly the language for compilation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4002
2019-11-07 10:24:33 -05:00
Cristian Adam
9a7b4f47aa ObjC: Mark explicitly the language for compilation
This way you can have .cpp files compiled as ObjC++.

Fixes: #19926
2019-11-06 16:21:45 +01:00
Brad King
ef86e8991b Merge topic 'FindBoost-meta-component-ALL' into release-3.16
77a01c398f FindBoost: Prevent warning due to new meta-component "ALL" of Boost 1.73

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3996
2019-11-06 09:25:43 -05:00
Craig Scott
e0ec13059a Merge topic 'doc-discourse' into release-3.16
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
2019-11-06 05:51:26 -05:00
Brad King
4af39fe25b CMakeSystemSpecificInformation: Replace mailing list with Discourse Forum
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.
2019-11-06 21:45:12 +11:00
Deniz Bahadir
77a01c398f FindBoost: Prevent warning due to new meta-component "ALL" of Boost 1.73 2019-11-05 11:59:47 -05:00
Brad King
3c0a317a1d Merge branch 'findpostgres-10-and-older' into release-3.16
Merge-request: !3993
2019-11-05 11:31:24 -05:00
Brad King
408a3a7d5e Merge branch 'objc-pch' into release-3.16
Merge-request: !3983
2019-11-05 11:31:10 -05:00
Ben Boeckel
e992d62b7e FindPostgreSQL: support version encoding used in pre-10 releases
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
2019-11-04 16:38:52 -05:00
Cristian Adam
e331367a89 PCH: Add support for OBJC/OBJCXX languages 2019-11-03 21:34:39 +01:00
Tomasz Słodkowicz
f805cdd261 FindwxWidgets: Add support for 3.1.3 VS binaries 2019-11-01 10:08:18 -04:00
Brad King
a53921b016 Merge branch 'swift-rpath' into release-3.16
Merge-request: !3965
2019-10-31 09:08:34 -04:00
Craig Scott
e5cc8f575b Merge branch 'docs-CMakePrintHelpers-typo' into release-3.16
Merge-request: !3966
2019-10-31 21:28:16 +11:00
Craig Scott
fea940eb86 Help: Fix minor typo in CMakePrintHelpers module docs
Fixes: #19900
2019-10-31 10:24:17 +11:00
Saleem Abdulrasool
1e05f89f4b Swift: support BUILD_RPATH properties
Enable passing a RPATH to Swift shared libraries.  This enables testing
libraries before they have been installed.
2019-10-30 14:18:15 -04:00
Brad King
449a29296d Merge branch 'sdk-on-mac' into release-3.16
Merge-request: !3957
2019-10-28 13:39:52 -04:00
Brad King
ee366b0273 Merge branch 'FindCurses-formw' into release-3.16
Merge-request: !3947
2019-10-28 12:04:26 -04:00
nick black
84ce473255 FindCurses: use formw when wide support is requested
Fixes: #19883
2019-10-28 12:03:11 -04:00
Brad King
c10c9f839a Swift: Honor CMAKE_OSX_SYSROOT on Apple platforms
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
2019-10-28 11:52:31 -04:00
Brad King
f9193ca2dd Merge branch 'swift-parallel-jobs' into release-3.16
Merge-request: !3950
2019-10-28 11:37:39 -04:00
Saleem Abdulrasool
d9dd7cca66 Swift: correct flags for parallel jobs
`-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`.
2019-10-28 11:36:57 -04:00
Craig Scott
f4749489fd Merge branch 'docs-FindPython-minor-grammar' into release-3.16
Merge-request: !3953
2019-10-28 21:54:30 +11:00