mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-21 13:48:33 -05:00
Code Issues Packages Projects Releases Wiki Activity
45,574 Commits 2 Branches 401 Tags
067ee518f792b2babc9ae53c69bddeb5e15f3d76
Commit Graph

45574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brad King aeaa590cb2 Merge branch 'release-3.16' 2019-10-31 13:45:53 -04:00
Brad King bd986ed367 Merge topic 'clarify-BOOL-genex-eval' 
cd888f1133 Help: drop confusing reference to `if()` from `$<BOOL:>`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3969
 2019-10-31 13:45:22 -04:00
Brad King 91c26b3d38 Merge branch 'clarify-BOOL-genex-eval' into release-3.16 
Merge-request: !3969
 2019-10-31 11:52:38 -04:00
Ben Boeckel cd888f1133 Help: drop confusing reference to if() from $<BOOL:> 
`if()` uses the internal `IsOn` call whild `$<BOOL:>` uses `IsOff`. For
historical reasons, these are not inverses of each other, so drop
mention of `if()` from the documentation of `$<BOOL:>`.
 2019-10-31 11:49:43 -04:00
Brad King 382607c960 Merge branch 'release-3.16' 2019-10-31 10:36:15 -04:00
Brad King c1d5d5eb11 CMake 3.16.0-rc3 v3.16.0-rc3 2019-10-31 09:25:31 -04:00
Brad King a9d02dab77 Merge branch 'release-3.16' 2019-10-31 09:13:41 -04: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 e5b90743e6 Merge topic 'help-file-spelling-error' 
e0412a0e0b Help: Fix spelling error in file(GET_RUNTIME_DEPENDENCIES) docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3964
 2019-10-31 09:10:23 -04:00
Brad King 6f15cea15e Merge topic 'autogen_windows_search_fix' 
90d643c312 Autogen: Fix ambiguity in header file detection on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3962
 2019-10-31 09:09:39 -04:00
Brad King a53921b016 Merge branch 'swift-rpath' into release-3.16 
Merge-request: !3965
 2019-10-31 09:08:34 -04:00
Brad King d3c8610556 Merge branch 'help-file-spelling-error' into release-3.16 
Merge-request: !3964
 2019-10-31 09:08:27 -04:00
Brad King 7fa657b41d Merge branch 'autogen_windows_search_fix' into release-3.16 
Merge-request: !3962
 2019-10-31 09:08:18 -04:00
Brad King 9a72065fa9 Merge topic 'update-kwsys' 
5ddcaae77c Merge branch 'upstream-KWSys' into update-kwsys
fe6725a1f7 KWSys 2019-10-30 (43131a7c)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3963
 2019-10-31 08:54:45 -04:00
Craig Scott fde927d76b Merge branch 'release-3.16' 2019-10-31 21:28:40 +11: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
Kitware Robot e4a5215e97 CMake Nightly Date Stamp 2019-10-31 00:01:10 -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
Marc Chevrier e0412a0e0b Help: Fix spelling error in file(GET_RUNTIME_DEPENDENCIES) docs 2019-10-30 13:49:54 -04:00
Brad King 79e0cd9696 Merge branch 'release-3.15' 2019-10-30 10:47:14 -04:00
Brad King 2a5e5b25ba CMake 3.15.5 v3.15.5 2019-10-30 09:44:41 -04:00
Sebastian Holtermann 90d643c312 Autogen: Fix ambiguity in header file detection on Windows 
On Windows, `CollapseFullPath` called with a path that ends with a dot
might return a file with the same base name but any extension.
To make sure we get only the file with the requested header extension,
pass the complete file name to `CollapseFullPath`.

Fixes: #19892
 2019-10-30 09:34:06 -04:00
Brad King dbf5ae35b5 Merge topic 'scanbuild-fixes' 
fe5ba71bd0 Tests: Suppress clang scan-build warning in UTF8 test
3cf71e8c7d cmLocalGenerator: Drop unused initializer in AddUnityBuild

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3958
 2019-10-30 09:30:34 -04:00
Brad King f22d4809a4 Merge branch 'release-3.16' 2019-10-30 09:29:00 -04:00
Brad King 03a0d8ffd4 Merge topic 'fix-find_package-doc' 
9a08818e54 Help: Add OPTIONAL_COMPONENTS to config mode signature of find_package.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3961
 2019-10-30 09:26:54 -04:00
Brad King 1efc4c9051 Merge branch 'fix-find_package-doc' into release-3.16 
Merge-request: !3961
 2019-10-30 09:26:09 -04:00
Brad King 28a8561885 Merge topic 'bootstrap-break' 
1dbf485934 bootstrap: Avoid redundant compiler selection checks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3959
 2019-10-30 09:25:48 -04:00
Deniz Bahadir 9a08818e54 Help: Add OPTIONAL_COMPONENTS to config mode signature of find_package. 2019-10-30 09:24:36 -04:00
Brad King 5ddcaae77c Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2019-10-30 (43131a7c)
 2019-10-30 09:17:30 -04:00
KWSys Upstream fe6725a1f7 KWSys 2019-10-30 (43131a7c) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 43131a7c283dd6f198a2318a25e546a97ac356b3 (master).

Upstream Shortlog
-----------------

Brad King (1):
      cdd52ce1 RegularExpression: Initialize RegularExpressionMatch arrays fully

Todd Martin (1):
      569a1aed Encoding: Add ToWindowsExtendedPath support for wide string
 2019-10-30 09:17:30 -04:00
Kitware Robot 5b64788c51 CMake Nightly Date Stamp 2019-10-30 00:01:07 -04:00
Brad King 931d734a3f Merge branch 'bootstrap-break' into release-3.16 
Merge-request: !3959
 2019-10-29 12:05:13 -04:00
Brad King 1dbf485934 bootstrap: Avoid redundant compiler selection checks 
In commit 6e613ff399 (bootstrap: Add infrastructure to detect threading
flags, 2017-11-28, v3.11.0-rc1~281^2~1) an extra level of nesting was
added to the selection loop, but the inner-most `break` command used to
exit the loop on success was not updated.  This caused the outer-most
loop to iterate unnecessarily and repeatedly try the same compilers
again.  In the case of compilers requiring a `-std=` flag, this may have
caused the oldest standard to be used instead of the newest.
 2019-10-29 12:03:54 -04:00
Brad King fe5ba71bd0 Tests: Suppress clang scan-build warning in UTF8 test 
Clang scan-build 7 reports:

```
Tests/CMakeLib/testUTF8.cxx:12:3: warning: 4th function call argument is an uninitialized value
  printf("[0x%02X,0x%02X,0x%02X,0x%02X]", static_cast<int>(d[0]),
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
```

Manual tracing of all call sites shows that all values are initialized.
 2019-10-29 11:20:47 -04:00
Brad King 1fb4839225 Merge topic 'ccmake_progress_bar_and_log_display' 
2086da1713 ccmake: Add output and progress bar release note
66d969fcc4 ccmake: Don't overwrite the last character of the title
1d0e557aed ccmake: Display output during configure and generate
c168e789df ccmake: Use the error display for all the logs
3300070cc2 ccmake: Display an ASCII progress bar in the status bar

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3942
 2019-10-29 11:18:16 -04:00
Brad King c299d10a2e Merge topic 'FindPackageModeMakefileTest-isysroot' 
c37f4eff5e FindPackageModeMakefileTest: macOS needs isysroot flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3956
 2019-10-29 11:17:31 -04:00
Brad King b4b6a3e7e5 Merge branch 'release-3.16' 2019-10-29 11:15:57 -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 8db410f336 Merge topic 'docs-find-vars' 
a0a7a45dbc Help: Fix markup errors, improve wording of CMAKE_FIND... variable docs
049dbdd38c Help: Document that <PackageName>_ROOT applies to config packages too

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3952
 2019-10-29 10:33:16 -04:00
Kitware Robot cffff0f17e CMake Nightly Date Stamp 2019-10-29 00:01:08 -04:00
Craig Scott c37f4eff5e FindPackageModeMakefileTest: macOS needs isysroot flag 
macOS/Xcode no longer populate /usr/include.
Building with the compiler directly instead of using /usr/bin/c++
can result in missing headers without the -isysroot flag.

Relates: #19885
 2019-10-29 07:14:08 +11:00
Brad King 3cf71e8c7d cmLocalGenerator: Drop unused initializer in AddUnityBuild 
Fix a warning from clang-scanbuild:

    warning: Value stored to 'chunk' during its initialization is never read
    for (size_t itemsLeft = filtered_sources.size(), chunk = batchSize,
                                                     ^~~~~   ~~~~~~~~~

Simply remove the initializer.
 2019-10-28 15:52:55 -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