Commit Graph

10291 Commits

Author SHA1 Message Date
Brad King
86610c65c2 Merge topic 'CTestCoverageCollectGCOV-typo'
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
d8062b575b Merge topic 'openssl-pkg-config-directories'
24d52daf49 FindOpenSSL: Lookup all pkg-config directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4010
2019-11-08 09:50:15 -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
Brad King
9f7ca15de6 Merge topic 'revert-FindBinUtils-ask-compiler'
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
Denis Thulin
24d52daf49 FindOpenSSL: Lookup all pkg-config directories
When using a custom sysroot to build things using pkg-config, some of
the output variables feature the sysroot while others do not:

```console
$ export PKG_CONFIG_SYSROOT_DIR=/path/to/sysroot
$ export PKG_CONFIG_LIBDIR=/path/to/sysroot/usr/lib/pkgconfig
$ pkg-config --cflags-only-I openssl
-I/path/to/sysroot/usr/include/
$ pkg-config --variable=includedir openssl
/usr/include
$ pkg-config --libs-only-L openssl
-L/path/to/sysroot/usr/lib
$ pkg-config --variable=libdir openssl
/usr/lib
```

When using `pkg_check_modules`, it's pretty much the same:
```cmake
pkg_check_modules(_OPENSSL QUIET openssl)
_OPENSSL_INCLUDE_DIRS == /path/to/sysroot/usr/include/
_OPENSSL_INCLUDEDIR == /usr/include
_OPENSSL_LIBRARY_DIRS == -L/path/to/sysroot/usr/lib
_OPENSSL_LIBDIR == /usr/lib
```

However, FindOpenSSL only searches for headers in `INCLUDEDIR` and
libraries in `LIBDIR` instead of searching `INCLUDE_DIRS` and
`LIBRARY_DIRS` as well.

This fixes that behaviour.

Fixes: #16885

Signed-off-by: Denis Thulin <denis.thulin@enyx.fr>
2019-11-07 16:44:12 +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
c2b3d0872e Merge topic 'objc-x-objc'
9a7b4f47aa ObjC: Mark explicitly the language for compilation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4002
2019-11-07 10:24:34 -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
Brad King
61ce9d1769 Merge branch 'backport-FindBoost-meta-component-ALL' into release-3.15
Merge-request: !4008
2019-11-07 09:31:59 -05:00
Deniz Bahadir
0faeb6a428 FindBoost: Prevent warning due to new meta-component "ALL" of Boost 1.73 2019-11-07 09:29:54 -05:00
Brad King
4011b1be41 Merge branch 'backport-findpostgres-10-and-older' into release-3.15
Merge-request: !4007
2019-11-07 09:29:20 -05:00
Ben Boeckel
aeae4182cb 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-07 09:24:12 -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
0618f8b3ed Merge topic 'cpack-nsis-welcome-finish-title'
68b5af65fa CPack/NSIS: Add options for custom welcome/finish titles + display on 3 lines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3980
2019-11-06 09:28:05 -05: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
Brad King
9d8bb7bc4e Merge topic 'FindBoost-meta-component-ALL'
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
Craig Scott
7046d4cbe5 Merge topic 'doc-discourse'
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
Johnny Jazeix
68b5af65fa CPack/NSIS: Add options for custom welcome/finish titles + display on 3 lines
Fixes: #11275
2019-11-05 20:09:53 +01: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
370fe1495b Merge topic 'remove_sh_error_mingw'
82ddcf0db1 MinGW Makefiles: do not fail if sh.exe is present in the path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3978
2019-11-05 11:32:58 -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
Brad King
13ea5f06fa Merge topic 'objc-pch'
e331367a89 PCH: Add support for OBJC/OBJCXX languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3983
2019-11-05 11:24:55 -05:00
Brad King
3521e3d524 Merge topic 'findpostgres-10-and-older'
e992d62b7e FindPostgreSQL: support version encoding used in pre-10 releases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3993
2019-11-05 11:23:59 -05:00
Hong Xu
2e9feddf68 FindCUDA: Use find_program instead of find_path when searching for nvcc.
Before this commit, nvcc would not be found if it is in env PATH but a
non-standard location. This commit fixes this issue.
2019-11-04 14:17:20 -08: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
Brad King
2654a2e999 Merge topic 'FindCUDA-find-nvcc'
f4eebeb447 FindCUDA: Revert "Use find_program instead of find_path to find nvcc"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3991
2019-11-04 14:53:45 -05:00
Brad King
f4eebeb447 FindCUDA: Revert "Use find_program instead of find_path to find nvcc"
Revert commit 067ee518f7 (FindCUDA: Use find_program instead of
find_path to find nvcc, 2019-10-31).  It causes `CUDA_TOOLKIT_ROOT_DIR`
to contain the path to nvcc rather than the toolkit directory.
2019-11-04 14:50:04 -05:00
Craig Scott
9667996923 Merge topic 'message-check-types'
7b2dd9dedc Refactor: Use added message types in various modules
949a1e120a message: New message types to mark checks performed by CMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3689
2019-11-04 14:11:45 -05:00
Johnny Jazeix
82ddcf0db1 MinGW Makefiles: do not fail if sh.exe is present in the path
The check was added only to fail early in an environment known not to work
at the time:

* https://web.archive.org/web/20120912010035/http://lists.trolltech.com/qt-interest/2006-01/thread00091-0.html

Fixes: #19327
2019-11-04 12:03:48 -05:00
Brad King
dbd14ecacf Merge topic 'FindPython-customize-failure-message'
687a354518 FindPython: customize failure message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3970
2019-11-04 10:30:39 -05:00
Brad King
b30701f045 Merge topic 'FindwxWidgets-wxwin-313'
f805cdd261 FindwxWidgets: Add support for 3.1.3 VS binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3972
2019-11-04 10:23:46 -05:00
Cristian Adam
e331367a89 PCH: Add support for OBJC/OBJCXX languages 2019-11-03 21:34:39 +01:00
Alex Turbov
7b2dd9dedc Refactor: Use added message types in various modules
Co-Authored-By: Craig Scott <craig.scott@crascit.com>
2019-11-02 14:10:09 +02:00
Tomasz Słodkowicz
f805cdd261 FindwxWidgets: Add support for 3.1.3 VS binaries 2019-11-01 10:08:18 -04:00
Hong Xu
067ee518f7 FindCUDA: Use find_program instead of find_path to find nvcc
Otherwise nvcc is not found if it is in env PATH but a non-standard
location.
2019-11-01 09:57:11 -04:00
Marc Chevrier
687a354518 FindPython: customize failure message 2019-11-01 12:10:30 +01:00
Brad King
abd223cf05 Merge topic 'swift-rpath'
1e05f89f4b Swift: support `BUILD_RPATH` properties

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3965
2019-10-31 09:11:19 -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
8259ea3014 Merge topic 'docs-CMakePrintHelpers-typo'
fea940eb86 Help: Fix minor typo in CMakePrintHelpers module docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3966
2019-10-31 06:26:46 -04: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
c5e22dfaea Merge topic 'swift-sdk-on-mac'
c10c9f839a Swift: Honor CMAKE_OSX_SYSROOT on Apple platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3957
2019-10-29 11:15:09 -04:00
Brad King
e90f6bacd5 Merge topic 'FindCurses-formw'
84ce473255 FindCurses: use formw when wide support is requested

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3947
2019-10-29 10:39:41 -04:00
Brad King
36516f0a50 Merge topic 'swift-parallel-jobs'
d9dd7cca66 Swift: correct flags for parallel jobs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3950
2019-10-29 10:34:17 -04:00