mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-24 07:28:54 -06:00
Code Issues Packages Projects Releases Wiki Activity
45,647 Commits 2 Branches 386 Tags
2a67ebf71b1b6086fcfdde04d77925038f81850c
Commit Graph

9813 Commits

Author SHA1 Message Date
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
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
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
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