Commit Graph

40827 Commits

Author SHA1 Message Date
Rolf Eike Beer
83c13ca44f FindThreads: Pass -pthread to CUDA compiler through -Xcompiler
Fixes: #18008
2018-10-24 10:15:41 -04:00
Brad King
cf92fd9ae9 Merge branch 'cuda-filter-device-link-items' into cuda-thread-flags 2018-10-24 10:14:32 -04:00
Robert Maynard
e768d96c74 CUDA: Filter out host link flags during device linking
Since commit v3.12.0-rc1~278^2 (CUDA: Pass more link libraries to device
linking, 2018-03-27) we consider every link item during device linking.
However, items that start in `-` may be host-specific link flags that
nvcc will not understand during device linking.  Filter such items using
a white list.

In particular, this allows `-pthread` to be used for host linking while
not polluting the device link line.

Issue: #18008
2018-10-24 09:54:25 -04:00
Brad King
718033b97d Merge branch 'GNUInstallDirs-kfreebsd-man' into release-3.13
Merge-request: !2511
2018-10-22 12:59:23 -04:00
James Clarke
b2d7ab8bd1 GNUInstallDirs: Don't use BSD info and man paths on GNU/kFreeBSD 2018-10-22 12:58:54 -04:00
Brad King
ec13ba36b5 Merge branch 'update-curl' into release-3.13
Merge-request: !2509
2018-10-22 12:55:14 -04:00
Brad King
8b5cd17000 Merge branch 'curl-ssize_t' into release-3.13
Merge-request: !2513
2018-10-22 12:55:05 -04:00
Brad King
3dc484e531 curl: add missing type sizes for 'long long' and '__int64'
When generating `curl_config.h`, add size information for `long long`
and `__int64` types.  These are needed as candidates for defining the
`ssize_t` type because on MSVC, `long` is not the same size as `size_t`.

This problem did not affect upstream curl because it computes the
`ssize_t` type in CMake code where all sizes are available.  CMake's
port computes it in preprocessor logic because universal binaries on
macOS do not know type sizes until compile time.

Fixes: #18477
2018-10-22 12:02:38 -04:00
Brad King
0310024563 curl: Update build within CMake to account for 7.61 changes
The_CURL_STATICLIB option was replaced by BUILD_SHARED_LIBS.

Drop our own CURL_STATICLIB compile definition because it is now
provided by curl's usage requirements.
2018-10-22 08:55:40 -04:00
Brad King
b9d1107790 curl: Backport to work with CMake 3.1 again
Curl 7.61.1 requires CMake 3.4 to build from source and also exposes
a dependency on OpenSSL imported targets.  Revert that part of the
changes imported from curl upstream.
2018-10-22 08:51:01 -04:00
Brad King
e9e8dcee6b Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2018-09-04 (432eb5f5)
2018-10-22 08:48:58 -04:00
Curl Upstream
18812a9c3d curl 2018-09-04 (432eb5f5)
Code extracted from:

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

at commit 432eb5f5c254ee8383b2522ce597c9219877923e (curl-7_61_1).
2018-10-22 08:24:16 -04:00
Brad King
ded211ae46 curl: Update script to get curl 7.61.1 2018-10-22 08:23:52 -04:00
Brad King
de1dec7052 Merge branch 'update-kwsys' into release-3.13
Merge-request: !2506
2018-10-19 10:29:07 -04:00
Brad King
bb6d439290 Merge branch 'deployqt4-cmp0080-fix' into release-3.13
Merge-request: !2494
2018-10-19 10:14:31 -04:00
Brad King
a833c24ceb Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2018-10-19 (c2f29d2e)
2018-10-19 10:03:25 -04:00
KWSys Upstream
43cb257648 KWSys 2018-10-19 (c2f29d2e)
Code extracted from:

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

at commit c2f29d2e929e58e36b4986d3ff5364a0d825cfca (master).

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

Ben Boeckel (1):
      a5caf8a4 cmake: support an alias target

Modestas Vainius (1):
      162b3ed7 SystemInformation: Fix compilation on GNU/{kFreeBSD,Hurd}
2018-10-19 10:03:25 -04:00
Kyle Edwards
15bbff0581 DeployQt4: Do not include BundleUtilities at configure time
Due to CMP0080, BundleUtilities can no longer be included at
configure-time. However, DeployQt4 contains some functions which
are meant to be used at configure-time, and some which are meant
to be used at install-time and use BundleUtilities. This change
breaks the file into two sections: common functions and install-time
functions. BundleUtilities is now only included at install-time,
thus fixing the policy warning.

Fixes: #18466
2018-10-19 09:54:10 -04:00
Brad King
f3719a790c Merge branch 'doc-target_link_libraries-item-quoting' into release-3.13
Merge-request: !2503
2018-10-18 13:33:29 -04:00
Brad King
18cff26e3a Help: Clarify command-line encoding of target_link_libraries items
Items that have full paths will be quoted automatically.  Other
items are treated as command-line string fragments and get no
automatic escaping.  Document the behavior for each item kind.

Fixes: #18467
2018-10-18 13:31:24 -04:00
Kyle Edwards
65bea5b90b DeployQt4: Convert to 2-space indentation 2018-10-18 12:03:14 -04:00
Kyle Edwards
9bfb63bd42 Help: Convert DeployQt4 to block-style comment 2018-10-18 12:03:14 -04:00
Brad King
09daee0780 Merge branch 'update-vim-syntax' into release-3.13
Merge-request: !2500
2018-10-18 07:55:26 -04:00
Brad King
3aa258db0e Merge branch 'upstream-vim-cmake-syntax' into update-vim-syntax
* upstream-vim-cmake-syntax:
  vim-cmake-syntax 2018-10-18 (64ff4bd7)
2018-10-18 07:53:55 -04:00
vim-cmake-syntax upstream
c9493939ea vim-cmake-syntax 2018-10-18 (64ff4bd7)
Code extracted from:

    https://github.com/pboettch/vim-cmake-syntax.git

at commit 64ff4bd793c247da5a1772fffad91378dddf03b9 (master).

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

Patrick Boettcher (1):
      64ff4bd7 break line after each high-lighting keyword
2018-10-18 07:52:33 -04:00
Brad King
2646fd8e03 Merge branch 'rel-doc-qthelp' into release-3.13
Merge-request: !2497
2018-10-18 07:39:07 -04:00
Brad King
fc675057e4 Merge branch 'revert-server-iface-sources' into release-3.13
Merge-request: !2495
2018-10-18 07:38:57 -04:00
Brad King
1d5c8b81db Utilities/Release: Add qthelp docs to binary archives
Fixes: #18465
2018-10-17 14:38:46 -04:00
Brad King
284a38e42f cmake-server: Revert "Support codemodel filegroups for INTERFACE_SOURCES"
Revert commit v3.13.0-rc1~144^2 (cmake-server: Support codemodel
filegroups for INTERFACE_SOURCES, 2018-08-10).  The changes activate
code paths not meant to be used with interface libraries.  Another
approach will be needed to expose this information later.

This revert has to be done by hand because the code in question has been
changed somewhat since the changes were made, and was also factored out
to another source file.

Fixes: #18463
2018-10-17 14:02:39 -04:00
Brad King
ab0edaabcc Merge branch 'document-dollar-in-varnames' into release-3.13
Merge-request: !2479
2018-10-16 11:03:08 -04:00
Ben Boeckel
82a4822610 CMP0053: document that $ is a valid literal variable character
This was overlooked in the initial implementation of CMP0053. However,
an additional policy to reject it again is not worth it. Instead, add
tests and document the behavior.

Fixes: #17883
2018-10-15 13:59:39 -04:00
Brad King
eca87ee811 Merge branch 'update_debug_target_properties' into release-3.13
Merge-request: !2480
2018-10-15 10:21:01 -04:00
Brad King
01fae460be Merge branch 'FindPkgConfig-operator-docs' into release-3.13
Merge-request: !2481
2018-10-15 10:16:18 -04:00
Craig Scott
7f2bc70c5e FindPkgConfig: Document support for > and < operators
This was left out of commit v3.13.0-rc1~14^2 (FindPkgConfig: support
also > and < operators for version compares, 2018-10-02).
2018-10-15 10:14:51 -04:00
Robert Maynard
86921f0264 Help: document CMAKE_DEBUG_TARGET_PROPERTIES support for LINK properties 2018-10-12 09:53:22 -04:00
Brad King
769fc9c4de Merge branch 'FindBoost-mt-release' into release-3.13
Merge-request: !2475
2018-10-11 14:18:49 -04:00
Mario Bielert
9c75922745 FindBoost: Search for -mt variant of release libs
We were searching the `-mt` variant for debug libs only.
It makes sense for release libs too.
2018-10-11 14:16:34 -04:00
Brad King
c9b7cd8ed7 Merge branch 'FindPython-updates' into release-3.13
Merge-request: !2476
2018-10-11 14:14:01 -04:00
Marc Chevrier
e23c41ba78 FindPython*: Add missing registry paths
Fixes: #18443
2018-10-11 14:13:31 -04:00
Brad King
d26f5b6889 Merge branch 'backport-revert-install-code-script-genex' into release-3.13
Merge-request: !2474
2018-10-11 08:11:21 -04:00
Brad King
0f48fbaa72 install: Revert CODE,SCRIPT support for generator expressions
Revert commit v3.13.0-rc1~441^2 (install: Teach CODE,SCRIPT modes to
evaluate generator expressions, 2018-05-29).  Unfortunately it has
been found to break existing code in a real project, e.g.

    install(CODE [[
        message("$<FOOBAR>")
    ]])

Address this regression by reverting support for the 3.13 release
series.  Support can be restored later with a policy for compatibility.

Issue: #15785
Fixes: #18435
2018-10-11 07:05:55 -04:00
Brad King
bcfb245703 Merge branch 'vs-cuda-pdb' into release-3.13
Merge-request: !2473
2018-10-10 13:41:44 -04:00
Brad King
faf3d7d224 VS: Add workaround for CUDA compiler PDB location with space
CUDA Toolkit Visual Studio Integration for version 9.2 and above does
honor the `ClCompile.ProgramDataBaseFileName` field when telling `nvcc`
how to invoke `cl`.  Unfortunately it does not quote paths with spaces
correctly:

    -Xcompiler "... /Fd"C:\path\with space\foo.pdb" ..."

Work around this by converting the PDB location to a relative path.
Likely we could always do this, but for now make a minimal change
just for CUDA support.

Fixes: #18440
2018-10-10 13:29:47 -04:00
Brad King
592064e026 VS: Drop workaround for CUDA compiler PDB location on CUDA 9.2+
The workaround added by commit v3.12.0-rc1~227^2 (VS: Add workaround for
CUDA compiler PDB location, 2018-04-13) is not necessary on CUDA 9.2+
because the CUDA Toolkit Visual Studio Integration has fixed the
original bug and forwards the `ProgramDataBaseFileName` to the host
compiler itself.  Make the workaround conditional on the CUDA version.

Issue: #18440
2018-10-10 13:29:47 -04:00
Brad King
fb378fc4d7 Tests: Fix Cuda test project names
Make them match what `ADD_TEST_MACRO` gives to ctest as the
project name to build so that the `.sln` file will be found.
2018-10-10 13:29:47 -04:00
Brad King
a8a485715a Merge branch 'update-vim-syntax' into release-3.13
Merge-request: !2469
2018-10-10 07:18:48 -04:00
Patrick Boettcher
7330a89f56 Merge branch 'upstream-vim-cmake-syntax'
* upstream-vim-cmake-syntax:
  vim-cmake-syntax 2018-10-10 (ac1957fb)
2018-10-10 07:17:08 -04:00
vim-cmake-syntax upstream
456d96f0d5 vim-cmake-syntax 2018-10-10 (ac1957fb)
Code extracted from:

    https://github.com/pboettch/vim-cmake-syntax.git

at commit ac1957fbccd24abc91089517f9116272825f8340 (master).

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

Pablo Hernandez-Cerdan (1):
      baf680ae Add syntax for new cmake variables

Patrick Boettcher (5):
      2c9d5fda handle bracket-comments and arguments correctly
      37d3bcb0 add test for bracket-comments and arguments
      99b4a3d9 promote package_config_file-st to .in-file and add test
      3ed26c29 update to cmake version 3.13.20181010-ga3598
      ac1957fb update README
2018-10-10 10:55:01 +02:00
Brad King
6784acfbe0 CMake 3.13.0-rc1 v3.13.0-rc1 2018-10-09 09:04:28 -04:00
Brad King
f6193d92fd Merge branch 'FindBISON-fix-verbose-file' into release-3.13
Merge-request: !2467
2018-10-09 09:01:21 -04:00