Commit Graph

10026 Commits

Author SHA1 Message Date
Ben Boeckel 46de38dae2 ExternalProject: replace LIST_SEPARATOR in initial cache files too 2019-11-20 09:21:46 -05:00
Brad King 5aa94a1d0d Merge topic 'sdcc-sdar'
5cf404d36f SDCC compiler: use sdar instead of sdcclib as librarian for recent versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4065
2019-11-19 11:28:13 -05:00
Brad King fb7f8e5fbd Merge topic 'FindFLEX-work-dir'
c5fb36a4cb FindFLEX: Add policy CMP0098 to run flex in build tree

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3981
2019-11-19 11:27:15 -05:00
Johnny Jazeix 5cf404d36f SDCC compiler: use sdar instead of sdcclib as librarian for recent versions
Fixes: #19988
2019-11-18 20:12:49 +01: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 9c9bbedd31 Merge topic 'swift-rpath-darwin'
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 eead6a2504 Merge topic 'swift-darwin-install-name'
f935de6746 Swift: support `INSTALL_NAME_DIR` on Darwin

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4060
2019-11-18 13:42:09 -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 bd16555717 Merge topic 'CPackNuget-dep-id'
26367b4bb2 CPack/NuGet: Do not mangle non-C-identifier chars in dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4044
2019-11-18 09:50:14 -05:00
Jannick c5fb36a4cb FindFLEX: Add policy CMP0098 to run flex in build tree 2019-11-15 11:46:06 -05:00
Kyle Edwards 5695b0464b Merge topic 'cmake-e-rm'
2d0100fac7 replace remove and remove_directory with rm in tests
5239fc5c75 cmake -E: Add rm with improved semantics over remove and remove_directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3949
2019-11-15 09:57:56 -05:00
Brad King c029829665 Merge topic 'FindPostgreSQL-macports-libsuffix'
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:37 -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
yacoub 26367b4bb2 CPack/NuGet: Do not mangle non-C-identifier chars in dependencies
Fixes: #19956
2019-11-14 14:48:03 -05:00
Johnny Jazeix 2d0100fac7 replace remove and remove_directory with rm in tests 2019-11-13 18:02:18 -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
Brad King 1257fc91ff Merge topic 'FindwxWidgets-mingw'
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 444461c97c Merge topic 'FindwxWidgets-qt'
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 e42c018642 Merge topic 'swift-rpath-separator'
a27a1c7e88 Swift: Allow build and installed RPATHs to differ

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4037
2019-11-13 09:37:43 -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
Brad King aec81b301e Merge topic 'findcuda_stop_exposing_raw_pthreads_lib'
46371132b3 FindCUDA: CUDA_LIBRARIES doesn't contain raw `-pthread`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4035
2019-11-12 09:53:42 -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
Craig Scott 27020c81d5 Merge topic 'remove-CPACK_INSTALL_CMAKE_CONFIGURATIONS'
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
Robert Maynard 46371132b3 FindCUDA: CUDA_LIBRARIES doesn't contain raw -pthread
If a person tried to pass `CUDA_LIBRARIES` to nvcc compiler it could
fail as it might have `-pthread` which nvcc doesn't support. Instead
we now use the `Threads::Threads` so that nvcc gets the correct
`-Xcompiler -pthread` flag.
2019-11-11 11:52:02 -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 b75882c2f7 Merge topic 'objc-link-main'
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 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