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
47,645 Commits 2 Branches 401 Tags
120eb23104ef7995d83feef3356df75416aeafd7
Commit Graph

47645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot 120eb23104 CMake Nightly Date Stamp 2020-04-11 00:01:11 -04:00
Brad King 7e302b6438 Merge topic 'openal-typo' 
dab57d3f5f FindOpenAL: Fix documentation typos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4596
 2020-04-10 11:05:37 -04:00
Brad King bf120819c4 Merge topic 'find_program-exe-no-read' 
86e6349ef7 find_program: Find programs that are executable but not readable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4571
 2020-04-10 09:49:50 -04:00
Nguyễn Gia Phong dab57d3f5f FindOpenAL: Fix documentation typos 2020-04-10 20:49:10 +07:00
Brad King 9ef0f35670 Merge topic 'ccmake-better-string-ops' 
603a532b58 cmCursesLongMessageForm: avoid unnecessary string allocation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sylvain Joubert <joubert.sy@gmail.com>
Merge-request: !4590
 2020-04-10 09:48:41 -04:00
Brad King 35eb021942 Merge topic 'FindBLAS_FindLAPACK_ArmPL' 
14ffa6e90e Find{BLAS,LAPACK}: Add support for ArmPL targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4502
 2020-04-10 09:47:29 -04:00
Brad King 6c737b273a Merge topic 'googletest-skipped' 
89a843d6ea GoogleTest: Add testcase for skipped tests
98868dad1c GoogleTest: Add support for skipped tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4586
 2020-04-10 09:46:14 -04:00
Alexander Stein 89a843d6ea GoogleTest: Add testcase for skipped tests 
This simply runs a mocked test case which uses the prefix for signaling
a skipped test.  CTest's output is checked for a skipped test result.
 2020-04-10 09:43:39 -04:00
Alexander Stein 98868dad1c GoogleTest: Add support for skipped tests 
Skipped tests are currently reported as successful. Using
SKIP_REGULAR_EXPRESSION on googletest's output prefix, skipped tests can
be detected and accounted accordingly.
Using SKIP_RETURN_CODE is not possible, googletests exit code is not
affected by skipped tests.

Fixes: #19669
 2020-04-10 09:43:26 -04:00
Brad King e61e9cec6d Merge branch 'release-3.16' 2020-04-10 08:52:58 -04:00
Brad King 4c82f309c5 CMake 3.16.6 v3.16.6 2020-04-10 07:37:32 -04:00
Kitware Robot 41c0adde02 CMake Nightly Date Stamp 2020-04-10 00:01:10 -04:00
Olly Perks 14ffa6e90e Find{BLAS,LAPACK}: Add support for ArmPL targets 
Add support for the Arm Performance Libraries (ArmPL) which provide an
implementation of BLAS, LAPACK and FFTW for use on Arm Linux systems:

    https://developer.arm.com/tools-and-software/server-and-hpc/compile/arm-compiler-for-linux/arm-performance-libraries
 2020-04-09 11:55:04 -04:00
Brad King fab932c3cb Merge branch 'release-3.17' 2020-04-09 11:27:14 -04:00
Ben Boeckel 603a532b58 cmCursesLongMessageForm: avoid unnecessary string allocation 
The addition makes a temporary string and then drops it after adding it
to `this->Messages`. Instead, just incrementally append.
 2020-04-09 11:04:45 -04:00
Brad King bd580b7d56 CMake 3.17.1 v3.17.1 2020-04-09 08:33:17 -04:00
Brad King 9532929216 Merge topic 'file-upload-tls' 
bf94dcba76 file(UPLOAD): Add support for TLS_VERIFY and TLS_CAINFO

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4580
 2020-04-09 08:31:19 -04:00
Brad King e2a1b463a9 Merge topic 'CTestCoverageCollectGCOV-log' 
5b12fe4633 CTestCoverageCollectGCOV: Avoid capturing gcov output in QUIET mode
43aaf2ac1e CTestCoverageCollectGCOV: Capture gcov output in log file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4582
 2020-04-09 08:29:12 -04:00
Brad King 4d54c15707 Merge branch 'release-3.17' 2020-04-09 08:12:13 -04:00
Brad King b8b98c98c3 Merge topic 'ccmake_incremental_log_display' into release-3.17 
60bfaa8fe6 ccmake: Use incremental rendering for the logs
e9b36731e9 cmCursesLongMessageForm: Factor out helper to draw message to form

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4573
 2020-04-09 08:12:12 -04:00
Brad King 0e1313cdf4 Merge topic 'ccmake_incremental_log_display' 
60bfaa8fe6 ccmake: Use incremental rendering for the logs
e9b36731e9 cmCursesLongMessageForm: Factor out helper to draw message to form

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4573
 2020-04-09 08:12:12 -04:00
Brad King 0f72aba269 Merge topic 'apple-arch-sysroots' into release-3.17 
84a1e67380 Apple: Fix mapping CMAKE_APPLE_ARCH_SYSROOTS to custom OSX_ARCHITECTURES
45fa9b32ca Apple: Improve handling of missing SDKs in CMAKE_APPLE_ARCH_SYSROOTS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4583
 2020-04-09 08:10:55 -04:00
Brad King 936225eb45 Merge branch 'release-3.17' 2020-04-09 08:10:55 -04:00
Brad King 73d358442c Merge topic 'apple-arch-sysroots' 
da25220d83 Merge branch 'backport-3.17-apple-arch-sysroots' into apple-arch-sysroots
84a1e67380 Apple: Fix mapping CMAKE_APPLE_ARCH_SYSROOTS to custom OSX_ARCHITECTURES
45fa9b32ca Apple: Improve handling of missing SDKs in CMAKE_APPLE_ARCH_SYSROOTS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4583
 2020-04-09 08:10:55 -04:00
Vladimir Menshakov 86e6349ef7 find_program: Find programs that are executable but not readable 
`find_program` internally uses `cmSystemTools::FileExists`
which calls `access(R_OK)` instead of `access(X_OK)`.
Use `cmSystemTools::IsFileExecutable` instead to fix this
issue.  An example of such a program is `sudo`.

Fixes: #10468
 2020-04-09 08:08:50 -04:00
Brad King df543e37f1 Merge topic 'update-kwsys' 
5abe64246d Merge branch 'upstream-KWSys' into update-kwsys
11d846b8ff KWSys 2020-04-09 (e798e567)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4588
 2020-04-09 08:08:08 -04:00
Brad King 5abe64246d Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-04-09 (e798e567)
 2020-04-09 07:34:08 -04:00
KWSys Upstream 11d846b8ff KWSys 2020-04-09 (e798e567) 
Code extracted from:

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

at commit e798e567760aaa6b87c31035c3f74622ecdcb5b2 (master).

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

Brad King (1):
      41700ca4 SystemTools: Fix FileIsExecutable on Windows
 2020-04-09 07:34:08 -04:00
Kitware Robot 5a62d86f8b CMake Nightly Date Stamp 2020-04-09 00:01:12 -04:00
Sylvain Joubert 60bfaa8fe6 ccmake: Use incremental rendering for the logs 
This should avoid an exponential slowdown in the display time for
projects with lots of output.
This is still slower than cmake due to the ncurses drawing, but it should
now be O(L) in total and not O(L^2) wrt to output length.

Fixes: #20535
 2020-04-08 14:40:09 -04:00
Brad King e9b36731e9 cmCursesLongMessageForm: Factor out helper to draw message to form 2020-04-08 14:39:46 -04:00
Brad King 5b12fe4633 CTestCoverageCollectGCOV: Avoid capturing gcov output in QUIET mode 
The `QUIET` mode suppresses any mention of our logged output, so do not
bother logging it.  This also provides a way for users to avoid saving
possibly large output on disk.

Fixes: #20554
 2020-04-08 13:53:36 -04:00
Brad King 43aaf2ac1e CTestCoverageCollectGCOV: Capture gcov output in log file 
The output of gcov can be large and we only display it in a failure
case.  Put it in a log file to avoid accumulating large output in
memory.

Issue: #20554
 2020-04-08 13:52:37 -04:00
Brad King da25220d83 Merge branch 'backport-3.17-apple-arch-sysroots' into apple-arch-sysroots 2020-04-08 13:44:42 -04:00
Brad King 84a1e67380 Apple: Fix mapping CMAKE_APPLE_ARCH_SYSROOTS to custom OSX_ARCHITECTURES 
The `CMAKE_OSX_ARCHITECTURES` value is not used directly by generators.
It is used to initialize a per-target `OSX_ARCHITECTURES` property, but
that property can also be set explicitly by project code to a subset of
the full list of architectures.  In order to handle this case, construct
a mapping from each `CMAKE_OSX_ARCHITECTURES` entry to the corresponding
`CMAKE_APPLE_ARCH_SYSROOTS` entry by name.  Use the mapping to find the
sysroot for each entry in `OSX_ARCHITECTURES` for a given target.

If `CMAKE_APPLE_ARCH_SYSROOTS` does not have the same length as
`CMAKE_OSX_ARCHITECTURES`, error out early rather than risking a crash
or assertion failure.

Fixes: #20534
 2020-04-08 13:40:09 -04:00
Brad King 45fa9b32ca Apple: Improve handling of missing SDKs in CMAKE_APPLE_ARCH_SYSROOTS 
Use `<arch>-SDK-NOTFOUND` instead of an empty string as a placeholder in
`CMAKE_APPLE_ARCH_SYSROOTS` for architectures whose SDK is not found.
This ensures the length of `CMAKE_APPLE_ARCH_SYSROOTS` matches the
length of `CMAKE_OSX_ARCHITECTURES`.  It also makes the missing SDKs
more visible in the value.

Issue: #20534
 2020-04-08 11:51:02 -04:00
Harry Mallon bf94dcba76 file(UPLOAD): Add support for TLS_VERIFY and TLS_CAINFO 
* Improve and test err messages when TLS_VERIFY and TLS_CAINFO
  are not set in file(DOWNLOAD) and file(UPLOAD).
 2020-04-08 15:15:49 +01:00
Brad King 37fa5122c2 Merge branch 'release-3.17' 2020-04-08 09:03:23 -04:00
Brad King 685bfad052 Merge topic 'ninja-order-depends' into release-3.17 
2f949be4b3 Ninja: Make config uppercase in object order target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4581
 2020-04-08 09:03:23 -04:00
Brad King 77053ed470 Merge topic 'ninja-order-depends' 
d54f0aa9b7 Merge branch 'master' into ninja-order-depends
2f949be4b3 Ninja: Make config uppercase in object order target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4581
 2020-04-08 09:03:23 -04:00
Brad King e8295e532b Merge topic 'file-upload-tls' 
9427763081 file(UPLOAD): Add default ca_certs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4579
 2020-04-08 08:51:11 -04:00
Brad King d5e44d7a38 Merge topic 'update-kwsys' 
ff2e597ba2 Merge branch 'upstream-KWSys' into update-kwsys
c5635588ad KWSys 2020-04-07 (caff9c3b)
2cc7baa1bc Tests: Fix get_filename_component PROGRAM test to use an executable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4578
 2020-04-08 08:48:56 -04:00
Brad King 12cdb3692d Merge topic 'update-libuv' 
630e501f8b libuv: Restore compilation on Apple i386 architecture
02a28f1d44 libuv: Restore compilation with XLClang 16.1 on AIX
82a06d5cb4 CTestCustom: Suppress scanbuild warning in libuv
722d6b4105 Merge branch 'upstream-libuv' into update-libuv
394b07af40 libuv 2020-04-06 (d21f5aea)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4576
 2020-04-08 08:48:01 -04:00
Kitware Robot 09d28262bf CMake Nightly Date Stamp 2020-04-08 00:01:12 -04:00
Kyle Edwards d54f0aa9b7 Merge branch 'master' into ninja-order-depends 2020-04-07 14:54:54 -04:00
Kyle Edwards 2f949be4b3 Ninja: Make config uppercase in object order target 
Fixes: #20539
 2020-04-07 14:28:35 -04:00
Harry Mallon 9427763081 file(UPLOAD): Add default ca_certs 
Default ca_certs were not added when using `UPLOAD` with built-in
(non-system) cURL.  Previously we only did this for `DOWNLOAD`.

Fixes: #20551
 2020-04-07 12:58:04 -04:00
KWSys Upstream c5635588ad KWSys 2020-04-07 (caff9c3b) 
Code extracted from:

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

at commit caff9c3bf3c9a95f4ac7f700532633603352e506 (master).

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

Vladimir Menshakov (1):
      66724af8 SystemTools: Teach FindProgram to find non-readable programs
 2020-04-07 10:31:10 -04:00
Brad King ff2e597ba2 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-04-07 (caff9c3b)
 2020-04-07 10:31:10 -04:00
Brad King 2cc7baa1bc Tests: Fix get_filename_component PROGRAM test to use an executable 2020-04-07 10:30:53 -04:00