mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-11 23:43:58 +03:00
Code Activity
47,352 Commits 2 Branches 415 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph
47352 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Zack Galbreath 4464ef21da ctest_submit: Check CA file during CDASH_UPLOAD 
This fixes a bug where ctest(SUBMIT CDASH_UPLOAD ...) would fail when
attemping to submit to a site bearing a genuine SSL certificate.
This code path was missing a call to cmCurlSetCAInfo() which loads
the certificate authority file.
 2018-06-27 15:08:14 -04:00
Matt Powley df2875b58d FindBoost: Update MSVC architecture check code style 2018-06-27 14:55:49 -04:00
Marc Chevrier 724bd7790e LINK_DEPENDS: add support of 'generator expressions' 2018-06-27 18:38:36 +02:00
Marc Chevrier cc9f88af53 LINK_DEPENDS: add support for property INTERFACE_LINK_DEPENDS 
Fixes: #17997
 2018-06-27 18:38:36 +02:00
Kitware Robot b142b72141 CMake Nightly Date Stamp 2018-06-27 00:01:05 -04:00
Daniel Franke 8661e7052c math: Diagnose divide-by-zero 2018-06-26 14:21:18 -04:00
Daniel Franke 7c4c13ffef math: Reject unexpected expression input explicitly 
Switch to C++ exceptions for lexer/parser error handling.
Teach the lexer/parser to fail on unexpected input.
 2018-06-26 14:15:21 -04:00
Daniel Wyatt 611ad19499 CPack/RPM: Use CMAKE_COMMAND to reference cmake executable 
Ensure we use the `cmake` corresponding to the running `cpack`
even if it is not first in `PATH` or has had its name changed.
This was accidentally left out in commit v3.7.0-rc1~81^2 (CPack/RPM:
Generate source rpm (SRPM) packages on demand, 2016-09-19).
 2018-06-26 13:25:08 -04:00
Brad King 2ba71a11e3 Merge branch 'lexer-null' into release-3.12 
Merge-request: !2174
 2018-06-26 13:04:25 -04:00
Brad King b29842a818 ListFileLexer: Do not match null bytes in input 
Extend the fix from commit v3.10.0-rc1~188^2 (ListFileLexer: fix
heap-buffer-overflow on malicious input, 2017-08-26) to apply to all
lexer token matches.  Replace all `.` with `[^\0\n]`.  Update all
`[^...]` match expressions to not match `\0`.

We cannot safely process null bytes in strings.

Fixes: #18124
 2018-06-26 11:54:34 -04:00
Brad King b2b3872f22 Merge branch 'FindMatlab-doc-mcr' into release-3.12 
Merge-request: !2173
 2018-06-26 11:28:40 -04:00
Brad King 27ae8d52d0 Help: Add 3.12 release note for FindMatlab MCR support 
This release note was forgotten by commit v3.12.0-rc1~183^2 (FindMatlab:
Matlab Runtime Compiler support, 2018-04-29).
 2018-06-26 11:12:19 -04:00
Kitware Robot d45d5e28ec CMake Nightly Date Stamp 2018-06-26 00:01:10 -04:00
Brad King 07cfb18f9d Merge branch 'release-3.12' 2018-06-25 10:21:10 -04:00
Brad King 2c36dabbee Merge topic 'libuv-new-version-file-location' 
889033b5c6 FindLibUV: Also check uv/version.h for version detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2169
 2018-06-25 10:20:38 -04:00
Brad King 7e283acde7 Merge branch 'libuv-new-version-file-location' into release-3.12 
Merge-request: !2169
 2018-06-25 10:17:38 -04:00
Raphael Kubo da Costa 889033b5c6 FindLibUV: Also check uv/version.h for version detection 
Starting with libuv 1.21.0, libuv's headers were moved into a uv/ directory.
Make FindLibUV aware of the file's new location for configuration to work.
 2018-06-25 10:16:46 -04:00
Brad King e9ec0cc3bb Merge topic 'update-kwsys' 
b41b30f16e Update use of KWSys SystemTools::SplitString for new signature
f2d97c1cdf Merge branch 'upstream-KWSys' into update-kwsys
6d7fdedde6 KWSys 2018-06-22 (49068d94)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2165
 2018-06-25 09:57:35 -04:00
Brad King 8848a1c07a Merge topic 'test-wizard' 
7bffd71c3b Tests: Adopt wizard test in RunCMake.CommandLine

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2166
 2018-06-25 09:56:56 -04:00
Brad King 268919069b Merge branch 'release-3.12' 2018-06-25 09:55:05 -04:00
Brad King ae153c6914 Merge topic 'vs-filter-default-toolset' 
3c4698da3a VS: Allow toolset version selection to specify default toolset
b759f7068f cmVSSetupHelper: Expose default toolset version
d548994afc cmVSSetupHelper: Use in-class member initialization

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2162
 2018-06-25 09:54:11 -04:00
Brad King 383f29fd63 Merge topic 'file-GLOB-remove-new-errors' 
142a625729 file: Drop error cases added by CMake 3.12.0-rc1 to avoid regressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Shane Parris <shane.lee.parris@gmail.com>
Merge-request: !2164
 2018-06-25 09:53:24 -04:00
Brad King 00523ad9c5 Merge branch 'vs-filter-default-toolset' into release-3.12 
Merge-request: !2162
 2018-06-25 09:39:30 -04:00
Kitware Robot 8e50de4dc5 CMake Nightly Date Stamp 2018-06-25 00:01:05 -04:00
Basil Fierz 3c4698da3a VS: Allow toolset version selection to specify default toolset 
Teach the feature added by commit v3.12.0-rc1~38^2 (VS: Add option to
select the version of the toolset used by VS 2017, 2018-05-19) to accept
the default toolset version in addition to older versions.  If the
default toolset version is supplied, simply clear it so the default will
be used.

Fixes: #18107
 2018-06-24 10:36:03 -04:00
Kitware Robot daf472f9be CMake Nightly Date Stamp 2018-06-24 00:01:08 -04:00
Craig Scott 3f58967887 Merge topic 'cmake-buildsystem-manual-typo' 
82956270ed Help: Fix typo in cmake-buildsystem(7) manual

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2163
 2018-06-23 17:20:50 -04:00
Kitware Robot 4b7e9cabc2 CMake Nightly Date Stamp 2018-06-23 00:01:13 -04:00
Brad King 7bffd71c3b Tests: Adopt wizard test in RunCMake.CommandLine 
Avoid a whole separate test for one removed command-line option.
 2018-06-22 13:59:14 -04:00
Brad King b41b30f16e Update use of KWSys SystemTools::SplitString for new signature 2018-06-22 13:38:18 -04:00
Brad King f2d97c1cdf Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2018-06-22 (49068d94)
 2018-06-22 11:31:36 -04:00
KWSys Upstream 6d7fdedde6 KWSys 2018-06-22 (49068d94) 
Code extracted from:

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

at commit 49068d948ee03cde172fe5ff15a2778c50f91d38 (master).

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

Brad King (1):
      5d6f59fe SystemTools: Change SplitString return type to use std::string
 2018-06-22 11:31:35 -04:00
Basil Fierz b759f7068f cmVSSetupHelper: Expose default toolset version 
We already detect the VS toolset version.  Expose it to clients.
 2018-06-22 10:07:09 -04:00
Brad King d548994afc cmVSSetupHelper: Use in-class member initialization 2018-06-22 10:07:09 -04:00
Brad King 44ca3d922c Merge topic 'cpack-generator-documentation' 
57e4c51e8a Help: Update old version release notes for CPack generator docs
4181830881 Help: Add release notes for CPack generator documentation and module updates
48bc8b2b82 CPack: Move internal implementation modules into Internal/CPack directory
2a2829cc75 Help: Add new section for CPack generators
be6267808a CPackIFW: Turn documentation into a block comment
0180524c7a Help: Move legacy CPack modules into separate section

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2149
 2018-06-22 09:48:00 -04:00
Brad King 5e1f519037 Merge topic 'cmake_autogen_verbose' 
5b85ef5cd0 Autogen: Add release notes for CMAKE_AUTOGEN_VERBOSE
6651aab2ab Autogen: Add documentation for CMAKE_AUTOGEN_VERBOSE
aa7d8a092c Autogen: Enable CMAKE_AUTOGEN_VERBOSE in all tests
e28dc3b1d8 Autogen: Add CMAKE_AUTOGEN_VERBOSE variable support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2157
 2018-06-22 09:46:17 -04:00
Brad King 1a21b4695a Merge topic 'vs_debugger' 
797de7a6f6 VS10Project: Expand VS_DEBUGGER_* capabilities

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2150
 2018-06-22 09:45:19 -04:00
Brad King 221f8aa7e2 Merge branch 'file-GLOB-remove-new-errors' into release-3.12 
Merge-request: !2164
 2018-06-22 09:42:07 -04:00
Brad King c03aeda083 Merge branch 'release-3.12' 2018-06-22 09:41:33 -04:00
Brad King 142a625729 file: Drop error cases added by CMake 3.12.0-rc1 to avoid regressions 
Refactoring in commit v3.12.0-rc1~418^2~3 (Refactor HandleGlobCommand,
2018-02-13) introduced error diagnostics for argument combinations that
were previously accepted.  Restore acceptance to avoid regressing
projects that used those combinations even if they do not make sense.

Fixes: #18097
 2018-06-22 09:39:05 -04:00
Brad King 7b46f59ee1 Merge topic 'FindJPEG-fix-debug' 
ae4a548302 FindJPEG: Drop ancient compatibility NATIVE_JPEG_* result variables
7876f329a9 FindJPEG: Add forgotten names of libraries for Debug configuration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2159
 2018-06-22 09:15:47 -04:00
Daniel Franke 5b0f73a15a math: Use 64-bit integer type for computation 2018-06-22 09:00:34 -04:00
Daniel Franke 963b8d9f6c math: Add RunCMake.math test to prepare for error cases 2018-06-22 09:00:34 -04:00
Joan Massich 82956270ed Help: Fix typo in cmake-buildsystem(7) manual 2018-06-22 11:26:59 +02:00
Kitware Robot 0375d73270 CMake Nightly Date Stamp 2018-06-22 00:01:07 -04:00
Robert Maynard 12e6f83319 Option: Add a test that verifies interaction with normal variables 2018-06-21 14:52:12 -04:00
Brad King 57e4c51e8a Help: Update old version release notes for CPack generator docs 
Replace references to the CPack "modules" with proper terminology
referencing the CPack generator documentation directly.
 2018-06-21 13:54:57 -04:00
Sebastian Holtermann 5b85ef5cd0 Autogen: Add release notes for CMAKE_AUTOGEN_VERBOSE 2018-06-21 19:18:18 +02:00
Sebastian Holtermann 6651aab2ab Autogen: Add documentation for CMAKE_AUTOGEN_VERBOSE 2018-06-21 19:18:18 +02:00
Sebastian Holtermann aa7d8a092c Autogen: Enable CMAKE_AUTOGEN_VERBOSE in all tests 2018-06-21 19:16:40 +02:00