mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-04 05:10:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
37,648 Commits 2 Branches 401 Tags
42461a2a01e314dffe8841bef329d44d180e0044
Commit Graph

37648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 42461a2a01 Merge topic 'cpack-dmg-errors' 
1943dc6b cmCPackDragNDropGenerator: Improve error reporting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1379
 2017-10-16 09:47:34 -04:00
Brad King 9c3bdbd584 Merge topic 'update-kwsys' 
df92617b Merge branch 'upstream-KWSys' into update-kwsys
e44b0cb2 KWSys 2017-10-12 (ef0ad34d)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1384
 2017-10-16 09:46:23 -04:00
Kitware Robot 386f7c6e98 CMake Nightly Date Stamp 2017-10-16 00:01:05 -04:00
Kitware Robot 7b26768dfa CMake Nightly Date Stamp 2017-10-15 00:01:03 -04:00
Kitware Robot 9628f0c001 CMake Nightly Date Stamp 2017-10-14 00:01:05 -04:00
Brad King df92617b73 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-10-12 (ef0ad34d)
 2017-10-13 09:14:04 -04:00
KWSys Upstream e44b0cb2f0 KWSys 2017-10-12 (ef0ad34d) 
Code extracted from:

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

at commit ef0ad34d280f0553fc4f6e7202a5e7d6241cdc9c (master).

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

Rolf Eike Beer (2):
      8717ac15 DynamicLoader: use std::string instead of strcpy() + strcat()
      88d4dd4b CommandLineArguments: use std::string in GenerateHelp()

Wouter Klouwen (1):
      749b7506 ProcessUNIX: Use monotonic clock in kwsysProcessTimeGetCurrent() for POSIX
 2017-10-13 09:13:56 -04:00
Kitware Robot 18eec11539 CMake Nightly Date Stamp 2017-10-13 00:01:06 -04:00
Brad King d0b6c2da8b Merge branch 'release-3.10' 2017-10-12 11:10:55 -04:00
Brad King 4d04ede10c CMake 3.10.0-rc2 v3.10.0-rc2 2017-10-12 09:25:33 -04:00
Brad King 7e69e08510 Merge branch 'release-3.10' 2017-10-12 09:24:06 -04:00
Brad King 8df52df84d Merge topic 'FindPythonLibs-names-per-dir' 
192ab741 FindPythonLibs: Allow find_library to search paths from system environment
3976a106 FindPythonLibs: Prefer libs early in search path regardless of name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1378
 2017-10-12 09:20:09 -04:00
Brad King 0d508b1ee1 Merge topic 'FindXMLRPC-no-includes' 
e7720a0f FindXMLRPC: Tolerate no include directories
b1aa8a47 FindXMLRPC: Drop unnecessary exec_program code paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1377
 2017-10-12 09:19:53 -04:00
Brad King 016daf0391 Merge topic 'clang-msvc-help' 
b6d3a1c0 Clang: Diagnose unsupported GNU-like clang targeting MSVC ABI

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1373
 2017-10-12 09:15:57 -04:00
Kitware Robot add1ba92f7 CMake Nightly Date Stamp 2017-10-12 00:01:05 -04:00
Clinton Stimpson 1943dc6bd5 cmCPackDragNDropGenerator: Improve error reporting 
When running hdiutil and other commands, capture errors and log them.
 2017-10-11 20:40:59 -06:00
Brad King f618142fb9 Merge branch 'FindXMLRPC-no-includes' into release-3.10 
Merge-request: !1377
 2017-10-11 11:22:00 -04:00
Brad King e7720a0f3f FindXMLRPC: Tolerate no include directories 
`xmlrpc-c-config $modules --cflags` may report no `-I` flags if the
headers are in a standard location like `/usr/include`.  In this case
it is okay for `XMLRPC_INCLUDE_DIRS` to be empty.

Ideally the `--cflags` output should be used as hints for a `find_path`
call to really find the headers as we do for other find modules, but
simply assuming no explicit include directories are needed is good
enough for now.

Fixes: #17347
 2017-10-11 11:19:03 -04:00
Brad King 192ab741ec FindPythonLibs: Allow find_library to search paths from system environment 
Drop the `NO_SYSTEM_ENVIRONMENT_PATH` option from our `find_library`
calls.  No other find modules do this.  Also, since commit
v3.3.0-rc1~430^2 (Teach find_(library|file|path) to get prefixes from
PATH, 2015-02-18) we always search the `lib` directory of each prefix
before the `bin` directory and so should prefer the non-`.dll` name.

Issue: #17336
 2017-10-11 11:07:58 -04:00
Brad King 3976a1066a FindPythonLibs: Prefer libs early in search path regardless of name 
Add `NAMES_PER_DIR` to all `find_library` invocations so that we
consider all possible names in each search directory before moving on to
the next directory.  This helps find the package that appears earliest
in the search path regardless of how it names its libraries.

Fixes: #17336
 2017-10-11 10:58:22 -04:00
Brad King b1aa8a4773 FindXMLRPC: Drop unnecessary exec_program code paths 
We always have `execute_process` now, so drop our ancient `exec_program`
code paths that are never used anymore.
 2017-10-11 10:31:32 -04:00
Brad King 609a6fe96d Merge branch 'clang-msvc-help' into release-3.10 
Merge-request: !1373
 2017-10-11 09:28:09 -04:00
Brad King a4b216711b Merge branch 'release-3.10' 2017-10-11 08:27:30 -04:00
Brad King 4594880be7 Merge topic 'cpack-deb-mr-1296-fix' 
c5db2f9a CPack/Deb: fix for regex passing even if invalid characters are present
529729d6 CPack/Deb: CPACK_DEBIAN_PACKAGE_VERSION regex testing exception

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1375
 2017-10-11 08:26:24 -04:00
Brad King 155c1505a5 Merge branch 'cpack-deb-mr-1296-fix' into release-3.10 
Merge-request: !1375
 2017-10-11 08:25:30 -04:00
Brad King 5fd0ce61f7 Merge topic 'linked-tree' 
ff09abb8 cmLinkedTree: avoid unnecessary copies during Push of T

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1351
 2017-10-11 08:24:23 -04:00
Brad King 86edb6660b Merge topic 'simplify-env-var-determination' 
5731f6d5 cm{Unset,Set}Command: use std::string to determine the env variable name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1350
 2017-10-11 08:22:58 -04:00
Brad King 7237d9489a Merge topic 'ExternalProject-CMP0054' 
491d2108 ExternalProject: Avoid if() auto-dereferene in quoted arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1369
 2017-10-11 08:21:14 -04:00
Brad King ce45b3e4e3 Merge branch 'ExternalProject-CMP0054' into release-3.10 
Merge-request: !1369
 2017-10-11 08:20:25 -04:00
Brad King 491d210898 ExternalProject: Avoid if() auto-dereferene in quoted arguments 
The implementation of this module doesn't expect such dereferences
to happen, but can when a project sets a variable called `x`.
Set `CMP0054` explicitly to get its NEW behavior.

Fixes: #17335
 2017-10-11 08:19:58 -04:00
Brad King 027bcee513 Merge topic 'UseJava_OUTPUT_DIR' 
dead049e UseJava: OUTPUT_DIR must exists in all cases.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1368
 2017-10-11 08:18:50 -04:00
Brad King 5d6ba8f2da Merge topic 'autogen-skip-ui' 
e95429fd Autogen: Docs: Extend SKIP_AUTOUIC documentation
814cddbe Autogen: Docs: Add examples for AUTORCC_OPTIONS and AUTOUIC_OPTIONS
1c196268 Autogen: Allow setting SKIP_AUTOUIC/GEN on .ui files not in the sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1366
 2017-10-11 08:17:57 -04:00
Brad King 401737f9ff Merge topic 'update-kwsys' 
f1a4ecdc Merge branch 'upstream-KWSys' into update-kwsys
c551ff58 KWSys 2017-10-10 (239bc737)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1370
 2017-10-11 08:15:24 -04:00
Brad King 48a58e91a6 Merge topic 'update-curl' 
bb759148 curl: Update build within CMake to account for 7.56 changes
9e3ef40e Merge branch 'upstream-curl' into update-curl
de7c21d6 curl 2017-10-04 (3ea76790)
2fad0e20 curl: Update script to get curl 7.56.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1372
 2017-10-11 08:14:44 -04:00
Brad King 165eff9382 Merge branch 'update-curl' into release-3.10 
Merge-request: !1372
 2017-10-11 08:13:15 -04:00
Brad King 6ada7f2e9b Merge topic 'test-tolerate-clang-sanitizers' 
0be7d61a Tests: Teach RunCMake to ignore clang unused sanitizer flag warnings
3f567a98 Tests: Refactor RunCMake output line ignore regex construction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1371
 2017-10-11 08:12:58 -04:00
Kitware Robot 6e1fd9269c CMake Nightly Date Stamp 2017-10-11 00:01:06 -04:00
Domen Vrankar c5db2f9a0f CPack/Deb: fix for regex passing even if invalid characters are present 
Regex [+-~] passes all characters between + and ~ and not only
+, - and ~
 2017-10-11 00:10:10 +02:00
Domen Vrankar 529729d6e7 CPack/Deb: CPACK_DEBIAN_PACKAGE_VERSION regex testing exception 
CPACK_DEBIAN_PACKAGE_VERSION variable could in the past also
contain release and epoch version so regex test should expect
the entire versioning if both CPACK_DEBIAN_PACKAGE_RELEASE
and CPACK_DEBIAN_PACKAGE_EPOCH are not set.
Also since the checks were not performed in the past the regex
test of CPACK_DEBIAN_PACKAGE_VERSION variable content should
only report author warnings instead of errors in case of the
test fail.

Fixes: #17339
 2017-10-11 00:10:01 +02:00
Brad King b6d3a1c09a Clang: Diagnose unsupported GNU-like clang targeting MSVC ABI 
The LLVM/Clang installer on Windows provides a `LLVM/bin` directory
containing `clang.exe` and `clang++.exe` command-line tools that have a
GNU-like command-line but target the MSVC ABI (instead of MinGW).  We
do not support this combination, so diagnose and reject it explicitly.
Tell users what to do to use the `clang-cl.exe` tool instead.

Issue: #16439
 2017-10-10 14:56:43 -04:00
Brad King 0a5987fa59 Merge branch 'autogen-skip-ui' into release-3.10 
Merge-request: !1366
 2017-10-10 13:53:34 -04:00
Sebastian Holtermann e95429fd85 Autogen: Docs: Extend SKIP_AUTOUIC documentation 2017-10-10 13:52:49 -04:00
Brad King f3bb9fcf0c Merge topic 'doc-lang-clarify' 
1ed11f1c Help: Minor text clarifications in cmake-language(7) manual

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1358
 2017-10-10 13:46:34 -04:00
Matthias Maennich 5731f6d5b1 cm{Unset,Set}Command: use std::string to determine the env variable name 2017-10-10 13:28:39 -04:00
Brad King 25b16ba3dc Merge branch 'doc-lang-clarify' into release-3.10 
Merge-request: !1358
 2017-10-10 11:29:26 -04:00
Brad King 1ed11f1c0d Help: Minor text clarifications in cmake-language(7) manual 
Clarify definitions of `bracket_open` and `bracket_close` productions.

In note about unquoted arguments containing unescaped double quotes,
provide examples of how they can be written as quoted arguments.

Also clarify location of nested calls supported by variable function
scope.

Suggested-by: Дилян Палаузов <dilyan.palauzov@aegee.org>
 2017-10-10 11:26:00 -04:00
Brad King bb7591487d curl: Update build within CMake to account for 7.56 changes 2017-10-10 11:15:20 -04:00
Brad King 9e3ef40edb Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2017-10-04 (3ea76790)
 2017-10-10 11:15:16 -04:00
Curl Upstream de7c21d677 curl 2017-10-04 (3ea76790) 
Code extracted from:

    https://github.com/curl/curl.git

at commit 3ea76790571c1f7cf1bed34fabffd3cc20ad3dd3 (curl-7_56_0).
 2017-10-10 11:15:03 -04:00
Brad King 2fad0e20b6 curl: Update script to get curl 7.56.0 2017-10-10 11:14:42 -04:00