mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 04:40:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
37,607 Commits 2 Branches 401 Tags
5d6ba8f2daab9ebff570f36908d48defdf37d607
Commit Graph

37607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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
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
Brad King 0be7d61abf Tests: Teach RunCMake to ignore clang unused sanitizer flag warnings 
These can show up in Release builds of CMake because some tests still
build Debug.
 2017-10-10 09:37:49 -04:00
Brad King 3f567a9847 Tests: Refactor RunCMake output line ignore regex construction 
Avoid one giant line.
 2017-10-10 09:35:31 -04:00
Brad King 8af7a16be7 Merge topic 'tryrun-strcpy' 
a483b7ea TryRun: do not call strcpy()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1364
 2017-10-10 09:10:54 -04:00
Brad King 60c688c6c3 Merge topic 'xcode-tests-ios-deployment-target' 
3a49b4eb Xcode 9: Lower iOS deployment version to get armv7 builds
78a560e4 Revert "Xcode: Adjust tests to drop of 32bit iOS architectures"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1365
 2017-10-10 09:10:05 -04:00
Gregor Jasny 3a49b4eb78 Xcode 9: Lower iOS deployment version to get armv7 builds 2017-10-10 09:08:44 -04:00
Gregor Jasny 78a560e42b Revert "Xcode: Adjust tests to drop of 32bit iOS architectures" 
This reverts commit d210b28130.
 2017-10-10 09:08:44 -04:00
Brad King f3bbb37b25 Merge branch 'release-3.10' 2017-10-10 09:03:48 -04:00
Brad King 54739743e5 Merge topic 'doc_bundle_wrong_plist_property' 
a56d9ecf Help: Fix wrong property reference for an app bundle's Info.plist

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1362
 2017-10-10 09:02:50 -04:00
Brad King 0a6dd27e86 Merge topic 'target_properties_doc_cleanup' 
b8010bda Help: Fix Example appearing in target property list of contents

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1361
 2017-10-10 09:02:22 -04:00
Brad King 9c81265438 Merge branch 'target_properties_doc_cleanup' into release-3.10 
Merge-request: !1361
 2017-10-10 09:00:57 -04:00
Brad King 581b9d9c77 Merge branch 'doc_bundle_wrong_plist_property' into release-3.10 
Merge-request: !1362
 2017-10-10 09:00:38 -04:00
Brad King e5f1be0f64 Merge branch 'FindCUDA-cuda-9-nppi' into release-3.10 
Merge-request: !1360
 2017-10-10 08:59:51 -04:00
Brad King dba09a3c21 Merge topic 'FindProtobuf-doc-typo' 
107fe8d5 FindProtobuf: fix documentation typo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1359
 2017-10-10 08:58:07 -04:00
Brad King ea6e5903e7 Merge topic 'ipo-escape-toolchain-path' 
11f4c19d IPO: Fix support for spaces in path to archive tools

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
Merge-request: !1356
 2017-10-10 08:57:05 -04:00
Brad King e110ab9e21 Merge topic 'FindCUDA-cuda-9-nppi' 
16589bf4 FindCUDA: Update for CUDA 9 breakup of nppi into multiple libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1360
 2017-10-10 08:52:35 -04:00
Brad King 6702ace882 Merge topic 'FindJava-tolerant-versions' 
6feb0c33 FindJava: Revise version parsing to support Java 9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1355
 2017-10-10 08:51:03 -04:00
Brad King 75ce489c20 Merge topic 'revise-3.10-relnotes' 
3cebe2ab Help: Revise 3.10 release notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1357
 2017-10-10 08:50:32 -04:00
Brad King f1a4ecdc0c Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-10-10 (239bc737)
 2017-10-10 08:43:41 -04:00
KWSys Upstream c551ff588b KWSys 2017-10-10 (239bc737) 
Code extracted from:

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

at commit 239bc737543886a72c5e9e3445d51e17f7e26abe (master).

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

Matthias Maennich (5):
      6599eda6 testRobustEncoding: restore format flags for std::cout before exiting
      862562ce SystemInformation: fix potential off-by-one write
      13e02b76 processUNIX: close intermediate file descriptor in error case
      73c491e8 processUNIX: fix not null terminated buffer during error reporting
      ce55a255 testSystemTools: fix some copy'n'paste issues

Rolf Eike Beer (5):
      6ca15069 SystemTools: make Getcwd() more efficient on Windows
      6d7eb3a1 CommandLineArguments: do not check variable before delete[]
      3b8fefea remove pointer checks before calling free()
      cf8beae3 ProcessUNIX: use strdup() instead of open coding it
      5d2aff9d ProcessWin32: use strdup() instead of open coding it
 2017-10-10 08:43:35 -04:00
Kitware Robot c798dc8573 CMake Nightly Date Stamp 2017-10-10 00:01:03 -04:00
Sebastian Holtermann 814cddbe18 Autogen: Docs: Add examples for AUTORCC_OPTIONS and AUTOUIC_OPTIONS 2017-10-09 14:36:48 +02:00
Sebastian Holtermann 1c19626864 Autogen: Allow setting SKIP_AUTOUIC/GEN on .ui files not in the sources 
SKIP_AUTOUIC and SKIP_AUTOGEN were ignored when set on a `.ui` file that
was not in the sources of the target.
 2017-10-09 14:35:17 +02:00
Kitware Robot cb8f26f199 CMake Nightly Date Stamp 2017-10-09 00:01:03 -04:00
Rolf Eike Beer a483b7eac2 TryRun: do not call strcpy() 2017-10-08 18:36:09 +02:00
Kitware Robot 4e96dc02c3 CMake Nightly Date Stamp 2017-10-08 00:01:03 -04:00
Craig Scott a56d9ecf75 Help: Fix wrong property reference for an app bundle's Info.plist 2017-10-07 19:55:51 +11:00
Craig Scott b8010bda3f Help: Fix Example appearing in target property list of contents 2017-10-07 18:01:23 +11:00
Kitware Robot 720c217ed5 CMake Nightly Date Stamp 2017-10-07 00:01:04 -04:00
Robert Maynard 16589bf46f FindCUDA: Update for CUDA 9 breakup of nppi into multiple libraries 
Fixes: #17310
 2017-10-06 11:05:35 -04:00
Brad King 9111c17767 Merge branch 'FindProtobuf-doc-typo' into release-3.10 
Merge-request: !1359
 2017-10-06 09:21:38 -04:00
Brad King 71a2fe2753 Merge branch 'ipo-escape-toolchain-path' into release-3.10 
Merge-request: !1356
 2017-10-06 09:21:27 -04:00
André Apitzsch 107fe8d5e4 FindProtobuf: fix documentation typo 
Fix typo in documentation added by commit v3.10.0-rc1~18^2
(FindProtobuf: add flag to allow descriptor files to be generated,
2017-09-21).
 2017-10-06 09:18:48 -04:00
Thomas Stenersen 11f4c19d7b IPO: Fix support for spaces in path to archive tools 
In the normal archiving rules the ``<CMAKE_AR>`` placeholder is replaced
by the generators with a properly-quoted path to the tool.  In the IPO
rules we specify the tools directly, so we need to quote them.

Fixes: #17326
 2017-10-06 08:15:55 -04:00
Brad King 25510a09d5 Merge branch 'FindJava-tolerant-versions' into release-3.10 
Merge-request: !1355
 2017-10-06 07:30:07 -04:00
Brad King 6feb0c3318 FindJava: Revise version parsing to support Java 9 
Java 9 has only one component.  Revise the logic to tolerate any number
of version components 1 through 4.  Fix the parsing of individual
components.

Fixes: #17325
 2017-10-06 07:29:30 -04:00
Brad King bd9451231c Merge branch 'revise-3.10-relnotes' into release-3.10 
Merge-request: !1357
 2017-10-06 07:21:07 -04:00
Brad King 60a7452811 Merge branch 'release-3.10' 2017-10-06 07:20:14 -04:00
Brad King 7a31da43b1 Merge branch 'findopenmp-fix-verbose' into release-3.10 
Merge-request: !1348
 2017-10-06 07:18:13 -04:00