mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 14:23:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
45,980 Commits 2 Branches 401 Tags
3c125c6de028aeed39b9f9629618f7b9842eccd5
Commit Graph

9889 Commits

Author SHA1 Message Date
Justin Goshi 3c125c6de0 VS: Support Visual Studio Clang Toolkit identification 
Teach CMake that the `ClangCl` toolset uses the `ClangClExecutable`
value as the path to the compiler executable.
 2019-12-05 11:48:48 -05:00
Brad King 797e55a5ef Merge topic 'xlf-ninja' 
19f267c75e XL: Add support for Ninja and XL Fortran

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4075
 2019-11-26 09:14:33 -05:00
Brad King 78a85fd069 Merge topic 'implicit-includes-extra-CR' 
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
 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 5c49f82a2d Merge topic 'FindODBC-mingw' 
cb8042b0ab FindODBC: Add library name for MinGW toolchains

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4076
 2019-11-26 08:56:33 -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 db3d3ab4fb Merge topic 'FindwxWidgets-rel-and-dbg' 
a5bb08a8c0 FindwxWidgets: Fix finding both release and debug libs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4079
 2019-11-25 09:38:07 -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
Brad King 19f267c75e XL: Add support for Ninja and XL Fortran 
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
 2019-11-21 15:59:12 -05:00
Brad King 0b14c3fded Merge topic 'FindMPI-improve-error' 
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
 2019-11-21 11:05:52 -05:00
Brad King 96820562c6 Merge topic 'UseJava-javadoc-classpath-separator' 
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
 2019-11-21 11:05:03 -05:00
Brad King d2f859f151 Merge topic 'ExternalProject-list-sep-in-cache' 
46de38dae2 ExternalProject: replace LIST_SEPARATOR in initial cache files too

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4070
 2019-11-21 11:04:03 -05:00
Brad King 905b7759ad Merge topic 'FindwxWidgets-qt-debug' 
84408ff402 FindwxWidgets: Find wxQt debug libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4069
 2019-11-21 11:00:33 -05:00
Nathan Burles 8d47b97a69 UseJava: Use correct path separator in javadoc 
For both classpath and sourcepath.
 2019-11-20 10:38:44 -05:00
Nathan Burles 1b27ac78ac UseJava: Use list(APPEND) to simplify javadoc option construction 2019-11-20 10:38:44 -05:00
Nathan Burles c7a4b1a58e UseJava: Extract the path separator to module level 
It is currently only defined within the add_jar function, but is needed
inside other functions in this module.
 2019-11-20 10:38:44 -05:00
Keith Ballard e221039e11 FindMPI: Improve error when a component's language is not enabled 
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
 2019-11-20 10:23: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
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