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

9836 Commits

Author SHA1 Message Date
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
Brad King f289ab61e3 Merge topic 'cpack-nsis-uninstaller-name' 
c97abc9688 CPack/NSIS: Add option for custom Uninstall filename

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3945
 2019-10-28 10:06:40 -04:00
Brad King cb13aa580d Merge topic 'ExternalProject-git-no-recurse' 
5bc6230741 ExternalProject: Option to turn off recursive update of git submodules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3923
 2019-10-28 10:05:45 -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
Craig Scott e03b677e70 Merge topic 'docs-FindPython-minor-grammar' 
9914b90f4a Help: Minor wording cleanup for Python modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3953
 2019-10-28 06:44:17 -04:00
Craig Scott 9914b90f4a Help: Minor wording cleanup for Python modules 2019-10-27 21:36:31 +11:00
Johnny Jazeix c97abc9688 CPack/NSIS: Add option for custom Uninstall filename 
Fixes: #10728
 2019-10-25 14:13:25 -04:00
Charis Marangos 5bc6230741 ExternalProject: Option to turn off recursive update of git submodules 
Fixes: #19832
 2019-10-24 13:36:19 -04:00
Brad King 04e0fa3307 Merge topic 'android-native' 
c5892e484e Android: add support for native compilation, such as with the Termux app

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3917
 2019-10-22 08:57:44 -04:00
Brad King 53f95dc5fb Merge topic 'export-compile-commands-environment-variable' 
8065a686dd Initialize CMAKE_EXPORT_COMPILE_COMMANDS from envvar of the same name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3914
 2019-10-21 11:23:47 -04:00
Brad King ede1bebd50 Merge topic 'FindOpenMP-include-dir' 
409891baf7 FindOpenMP: Allow try_compile() to find omp.h for AppleClang

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3916
 2019-10-21 11:20:33 -04:00
Brad King eaebd4fc47 Merge branch 'FindOpenMP-include-dir' into release-3.16 
Merge-request: !3916
 2019-10-21 11:09:56 -04:00
Daan De Meyer 8065a686dd Initialize CMAKE_EXPORT_COMPILE_COMMANDS from envvar of the same name 
Fixes: #18386
 2019-10-18 14:37:33 -04:00
Brad King b34b4c5eac Merge topic 'vs-vctargetspath' 
e7d57bc3c3 VS: Propagate CMAKE_VS_GLOBALS into custom targets
45b4b4b930 VS: Propagate CMAKE_VS_GLOBALS into compiler id projects
548e9051a4 VS: Add support to override VCTargetsPath through toolset
99e83d4235 cmake: Teach --build mode to load CMAKE_GENERATOR_TOOLSET

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3817
 2019-10-18 09:01:48 -04:00
Brad King 5417737fac Merge topic 'graphviz' 
553658393c Graphviz: added test suite, fixes, enhancements

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: slodki <slodki_dom@poczta.onet.pl>
Merge-request: !3766
 2019-10-17 13:54:26 -04:00
Alexander Boczar 45b4b4b930 VS: Propagate CMAKE_VS_GLOBALS into compiler id projects 
Issue: #19708
 2019-10-17 10:18:52 -04:00
Craig Scott 409891baf7 FindOpenMP: Allow try_compile() to find omp.h for AppleClang 
Fixes: #18098 #18470 #18520
 2019-10-17 18:50:05 +11:00
Brad King 0e5a3ae7a9 Merge topic 'FindCURL-cmake-package' 
c11e7c5c3d FindCURL: Try to find CURLConfig.cmake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3903
 2019-10-16 09:51:32 -04:00
Brad King 93b80638ce Merge topic 'CMakeFindBinUtils-cleanup' 
f0da223ff0 CMakeFindBinUtils: Remove unnecessary variable unset calls

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3920
 2019-10-16 09:45:59 -04:00
Brad King 4abdb1900a Merge topic 'FindCurses-tinfow' 
9fc87ef2e7 FindCurses: use tinfow when wide support is requested

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3915
 2019-10-16 09:44:08 -04:00
Brad King 2e133ca30b Merge topic 'FindHDF5-cray' 
08f4b5dcf9 FindHDF5: Append hdf5 to hdf5_hl to avoid undefined references
cd6f0ef35a FindHDF5: Cray HDF5 Fortran module filename is usually capitalized

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3918
 2019-10-16 09:43:12 -04:00
Charles Barto c11e7c5c3d FindCURL: Try to find CURLConfig.cmake 2019-10-15 13:56:28 -04:00
Alexander Boczar 548e9051a4 VS: Add support to override VCTargetsPath through toolset 
Fixes: #19708
 2019-10-15 13:28:45 -04:00
Butta c5892e484e Android: add support for native compilation, such as with the Termux app 
The CMake support for Android assumes cross-compilation using the NDK,
so stub out that Android NDK support and use the Linux support that's
already invoked. Set CMAKE_HOST_SYSTEM_NAME to "Android", rather than
"Linux".

Issue: #19840
 2019-10-15 21:13:51 +05:30
Brad King 080163a657 Merge branch 'CMakeFindBinUtils-cleanup' into release-3.16 
Merge-request: !3920
 2019-10-15 11:19:53 -04:00
Brad King c3c751e9dd Merge branch 'FindCurses-tinfow' into release-3.16 
Merge-request: !3915
 2019-10-15 11:19:44 -04:00
Brad King c89794feae Merge branch 'FindHDF5-cray' into release-3.16 
Merge-request: !3918
 2019-10-15 11:19:31 -04:00
Brad King e14518ec45 Merge topic 'FindOpenMP-clang-HIP-device' 
db5a8d7876 FindOpenMP: Add support for HIP clang device pass

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3911
 2019-10-15 11:13:10 -04:00
Brad King f0da223ff0 CMakeFindBinUtils: Remove unnecessary variable unset calls 
Some unset calls were added by commit 079b8e2916 (Clang: prefer lld-link
over link.exe, 2019-07-11, v3.16.0-rc1~161^2~2) but they are unnecessary
since commit 3a82ef78eb (CMakeFindBinUtils: Rename and unset variables
for additional names, 2019-07-23, v3.16.0-rc1~332^2~2).

Suggested-by: Norbert Lange <nolange79@gmail.com>
 2019-10-15 11:09:06 -04:00
Manuel Herrmann 9fc87ef2e7 FindCurses: use tinfow when wide support is requested 2019-10-15 09:50:52 -04:00
Willem Deconinck 08f4b5dcf9 FindHDF5: Append hdf5 to hdf5_hl to avoid undefined references 2019-10-15 09:47:58 -04:00
Willem Deconinck cd6f0ef35a FindHDF5: Cray HDF5 Fortran module filename is usually capitalized 2019-10-15 09:47:58 -04:00
Brad King 74035b0ad4 Merge branch 'FindOpenMP-clang-HIP-device' into release-3.16 
Merge-request: !3911
 2019-10-14 16:18:08 -04:00
Konstantin Pyzhov db5a8d7876 FindOpenMP: Add support for HIP clang device pass 
The HIP clang makes 2 passes when compiling HIP programs: the DEVICE
pass and the HOST pass.  For openmp, the `-fopenmp` option is only
passed to the HOST compilation pass.  Therefore, the small test that
CMake uses for OpenMP detection fails to compile, and CMake reports
failure to detect OpenMP support in the compiler.  The suggested
solution is to add check for `__HIP_DEVICE_COMPILE__` macro defined by
HIP clang for the DEVICE pass to the OpenMP detection test.
 2019-10-12 11:04:45 -04:00
Brad King 0a52bada33 Merge topic 'FindPostgreSQL-macports-and-v12' 
ec43d96657 FindPostgreSQL: support macports installation scheme
908dff41c6 FindPostgreSQL: support version 12

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3907
 2019-10-12 10:28:05 -04:00
Brad King 3f10e564e0 Merge topic 'iar-8051-support' 
5652e11ea1 IAR: Add 8051 support
6e51db9a40 IAR: Fix v850 assembler support file extensions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3906
 2019-10-12 10:27:06 -04:00
Brad King 04ad7b8571 Merge topic 'objc-c++flags' 
806e01d638 Objective-C: Do not treat Objective-C files as C++ files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3904
 2019-10-12 10:26:13 -04:00
Brad King 7676966f99 Merge topic 'InstallRequiredSystemLibraries-redist' 
ecbf6546d7 IRSL: Install vcruntime140_1.dll if available
2eecd1c3bc IRSL: Prefer MSVC runtime libraries from newest toolset first

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3909
 2019-10-12 10:23:34 -04:00
Brad King 75f361a00c Merge branch 'InstallRequiredSystemLibraries-redist' into release-3.16 
Merge-request: !3909
 2019-10-11 12:08:51 -04:00
Brad King ecbf6546d7 IRSL: Install vcruntime140_1.dll if available 
VS 2019 now distributes this additional runtime DLL with its `14.2x`
toolsets.

Fixes: #19829
 2019-10-11 12:05:51 -04:00
Brad King 2eecd1c3bc IRSL: Prefer MSVC runtime libraries from newest toolset first 2019-10-11 11:57:39 -04:00
Brad King d26ef5d807 Merge branch 'FindPostgreSQL-macports-and-v12' into release-3.16 
Merge-request: !3907
 2019-10-11 11:09:46 -04:00
Ben Boeckel ec43d96657 FindPostgreSQL: support macports installation scheme 
Macports installs into `include/postgresql${suffix}`. Add this to the
list of supported suffixes. Also copy the non-server
`postgresql/${suffix}` path.
 2019-10-11 11:04:13 -04:00
Ben Boeckel 908dff41c6 FindPostgreSQL: support version 12 2019-10-11 11:04:13 -04:00
Brad King 18f3e28652 Merge branch 'iar-8051-support' into release-3.16 
Merge-request: !3906
 2019-10-11 10:23:37 -04:00
Micael Borgefeldt 5652e11ea1 IAR: Add 8051 support 
Issue: #17264
 2019-10-11 10:22:52 -04:00
Micael Borgefeldt 6e51db9a40 IAR: Fix v850 assembler support file extensions 
Fix the file extension added by commit 158f3795b8 (IAR: Add v850
assembler support, 2019-09-23, v3.16.0-rc1~70^2).

Issue: #17264
 2019-10-11 10:22:52 -04:00