37601 Commits

Author SHA1 Message Date
Brad King
319622a49f CMake 3.10.0-rc3 v3.10.0-rc3 2017-10-19 10:20:40 -04:00
Brad King
069c1bd908 Merge branch 'vs-cuda-machine' into release-3.10
Merge-request: !1390
2017-10-17 10:47:14 -04:00
Brad King
fd90a14f1b VS: Set CUDA TargetMachinePlatform explicitly on x64
The `TargetMachinePlatform` setting tells CUDA what `--machine {32,64}`
flag to pass to nvcc.  While CUDA automatically chooses the proper
default for the target architecture, it does not reflect this in the
user-visible IDE settings.  Set it explicitly to fix the user-visible
setting.

Fixes: #17355
2017-10-17 10:41:41 -04:00
Brad King
5a25bda524 Merge branch 'findopenmp-lib-paths' into release-3.10
Merge-request: !1385
2017-10-17 09:59:48 -04:00
Christian Pfeiffer
f4cc71099a FindOpenMP: Improve OMP libraries search
This supports libraries given as full path and filters libraries given
in CMAKE_<LANG>_STANDARD_LIBRARIES.

Fixes: #17351
2017-10-17 09:53:57 -04:00
Brad King
07068d67e9 Merge branch 'vs-2017-cl-check' into release-3.10
Merge-request: !1388
2017-10-16 13:40:13 -04:00
Brad King
f566586e1c VS: Detect compiler component in VS 2017 instances more reliably
The `Microsoft.VisualStudio.Component.VC.Tools.x86.x64` component is
not the only way a VS instance may provide the `cl` compiler tool.
For example, VS 2017 Express Edition does not install that component.
Instead search for the tools directly on disk within an instance.

Suggested-by: Rich Chiodo <rchiodo@microsoft.com>
Fixes: #17349
2017-10-16 11:57:15 -04:00
Brad King
c6bb704ea1 cmVSSetupHelper: Fix install location encoding conversion 2017-10-16 11:55:53 -04:00
Brad King
4c3116d754 cmVSSetupHelper: Factor out install location string construction
This also adds a missing conversion to unix slashes in one code path.
2017-10-16 11:55:53 -04:00
Brad King
f64c554cc9 Merge branch 'imported-interface-no-system' into release-3.10
Merge-request: !1386
2017-10-13 14:36:45 -04:00
Brad King
22beb07f98 Help: Clarify documentation of NO_SYSTEM_FROM_IMPORTED
This property is meant to be set on the consumers of imported targets,
not the imported targets themselves.

Fixes: #17348
2017-10-13 14:32:15 -04:00
Brad King
2de0e0fdfa Do not initialize NO_SYSTEM_FROM_IMPORTED on INTERFACE libraries
The change in commit v3.8.0-rc1~276^2 (Allow NO_SYSTEM_FROM_IMPORTED on
imported INTERFACE libraries, 2016-11-21) was incorrect.  The property
is not meant to be set on imported targets at all.  It is meant to be
set on their consumers that compile sources.  Since INTERFACE libraries
have no sources to compile, the property is not needed on them.

Revert most of that change.  Unfortunately we must still tolerate
project code setting NO_SYSTEM_FROM_IMPORTED on INTERFACE libraries
because they were allowed by CMake 3.8 and 3.9.

Issue: #17348
2017-10-13 14:32:14 -04:00
Brad King
4d04ede10c CMake 3.10.0-rc2 v3.10.0-rc2 2017-10-12 09:25:33 -04: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
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
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
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
165eff9382 Merge branch 'update-curl' into release-3.10
Merge-request: !1372
2017-10-11 08:13:15 -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
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
Brad King
f686c45d62 Merge branch 'xcode-tests-ios-deployment-target' into release-3.10
Merge-request: !1365
2017-10-10 09:09:03 -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 d210b2813072c874ee13fcc941e41aacacf09874.
2017-10-10 09:08:44 -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
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
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
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