summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-curl' into update-curlBrad King2018-10-31124-2046/+5040
|\ | | | | | | | | * upstream-curl: curl 2018-10-30 (19667715)
| * curl 2018-10-30 (19667715)Curl Upstream2018-10-31124-2052/+5051
| | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 196677150f711a96c38ed123e621f1d4e995b2e5 (curl-7_62_0).
* | curl: Update script to get curl 7.62.0Brad King2018-10-311-1/+1
| |
* | CMake 3.13.0-rc2v3.13.0-rc2Brad King2018-10-251-1/+1
| |
* | Merge branch 'FindBoost-1.69' into release-3.13Brad King2018-10-251-14/+29
|\ \ | | | | | | | | | Merge-request: !2522
| * | FindBoost: Add support for upcoming Boost 1.69Mateusz Łoskot2018-10-251-14/+29
| | | | | | | | | | | | This makes the module usable with Boost from its current master.
* | | Merge branch 'cmake-gui-vs-open-space' into release-3.13Brad King2018-10-251-2/+3
|\ \ \ | | | | | | | | | | | | Merge-request: !2524
| * | | cmake-gui: Fix "Open Project" for VS IDE with space in pathBrad King2018-10-251-2/+3
| |/ / | | | | | | | | | | | | | | | Do not encode the path for a shell until after we check that it exists. Fixes: #18501
* | | Merge branch 'fix-no-testing' into release-3.13Brad King2018-10-242-4/+5
|\ \ \ | | | | | | | | | | | | Merge-request: !2520
| * | | Tests: Add missing BUILD_TESTING conditionsBrad King2018-10-242-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | We should not call `add_test` unless `BUILD_TESTING` is enabled. Fixes: #18500
* | | | Merge branch 'cuda-thread-flags' into release-3.13Brad King2018-10-249-18/+94
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !2512
| * | | | CUDA: Add test for device linking when host linking uses threadsRobert Maynard2018-10-247-16/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert the `CudaOnly.LinkSystemDeviceLibraries` test to a new `Cuda.ProperDeviceLibraries` test. The former covered only the `cublas_device` library which is removed by CUDA 10. Extend the new test to also cover various cases of using threads. Issue: #18008
| * | | | FindThreads: Pass -pthread to CUDA compiler through -XcompilerRolf Eike Beer2018-10-241-1/+3
| | | | | | | | | | | | | | | | | | | | Fixes: #18008
| * | | | Merge branch 'cuda-filter-device-link-items' into cuda-thread-flagsBrad King2018-10-241-1/+18
| |\ \ \ \
| | * | | | CUDA: Filter out host link flags during device linkingRobert Maynard2018-10-241-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge branch 'tar-warnings' into release-3.13Brad King2018-10-241-13/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2519
| * | | | | | cmake: Distinguish '-E tar' warnings from errors copying dataBrad King2018-10-241-13/+31
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic added by commit v3.12.0-rc1~62^2 (cmake: Teach '-E tar' to report errors copying data, 2018-05-16) incorrectly reports failure in the case of ARCHIVE_WARN. Convert this case to a warning. Fixes: #18496
* | | | | | Merge branch 'vs-csharp-win32-flags' into release-3.13Brad King2018-10-235-10/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2516
| * | | | | | VS: Fix CSharp support for win32res: and win32icon: flagsBrad King2018-10-235-10/+10
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a missing `:` to these entries in the flag table. The user value is always required and must come after the `:`. Fixes: #18486
* | | | | | Merge branch 'vs-csharp-in-custom-target' into release-3.13Brad King2018-10-234-0/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | Merge-request: !2515
| * | | | | VS: Fix crash on CSharp sources in a custom targetBrad King2018-10-234-0/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The target generator does not compute ClOptions for custom targets, so we should not use them either. Fixes: #18377, #18485
* | | | | Merge branch 'GNUInstallDirs-kfreebsd-man' into release-3.13Brad King2018-10-222-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | Merge-request: !2511
| * | | | GNUInstallDirs: Don't use BSD info and man paths on GNU/kFreeBSDJames Clarke2018-10-222-2/+2
| |/ / /
* | | | Merge branch 'update-curl' into release-3.13Brad King2018-10-22114-1859/+2568
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !2509
| * | | | curl: Update build within CMake to account for 7.61 changesBrad King2018-10-222-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | curl: Backport to work with CMake 3.1 againBrad King2018-10-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Merge branch 'upstream-curl' into update-curlBrad King2018-10-22112-1858/+2567
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * upstream-curl: curl 2018-09-04 (432eb5f5)
| | * | | curl 2018-09-04 (432eb5f5)Curl Upstream2018-10-22112-1865/+2573
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 432eb5f5c254ee8383b2522ce597c9219877923e (curl-7_61_1).
| * | | | curl: Update script to get curl 7.61.1Brad King2018-10-221-1/+1
| | |/ / | |/| |
* | | | Merge branch 'curl-ssize_t' into release-3.13Brad King2018-10-221-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !2513
| * | | | curl: add missing type sizes for 'long long' and '__int64'Brad King2018-10-221-0/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'update-kwsys' into release-3.13Brad King2018-10-192-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !2506
| * \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-10-192-1/+6
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-10-19 (c2f29d2e)
| | * | | KWSys 2018-10-19 (c2f29d2e)KWSys Upstream2018-10-192-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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}
* | | | | Merge branch 'deployqt4-cmp0080-fix' into release-3.13Brad King2018-10-192-368/+384
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2494
| * | | | | DeployQt4: Do not include BundleUtilities at configure timeKyle Edwards2018-10-192-71/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | DeployQt4: Convert to 2-space indentationKyle Edwards2018-10-181-259/+259
| | | | | |
| * | | | | Help: Convert DeployQt4 to block-style commentKyle Edwards2018-10-181-100/+101
| | | | | |
* | | | | | Merge branch 'doc-target_link_libraries-item-quoting' into release-3.13Brad King2018-10-181-0/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | Merge-request: !2503
| * | | | | Help: Clarify command-line encoding of target_link_libraries itemsBrad King2018-10-181-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge branch 'update-vim-syntax' into release-3.13Brad King2018-10-182-106/+2148
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2500
| * \ \ \ \ \ Merge branch 'upstream-vim-cmake-syntax' into update-vim-syntaxBrad King2018-10-182-106/+2148
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-vim-cmake-syntax: vim-cmake-syntax 2018-10-18 (64ff4bd7)
| | * | | | | | vim-cmake-syntax 2018-10-18 (64ff4bd7)vim-cmake-syntax upstream2018-10-182-106/+2148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge branch 'rel-doc-qthelp' into release-3.13Brad King2018-10-182-1/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2497
| * | | | | | | | Utilities/Release: Add qthelp docs to binary archivesBrad King2018-10-172-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18465
* | | | | | | | | Merge branch 'revert-server-iface-sources' into release-3.13Brad King2018-10-184-189/+40
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2495
| * | | | | | | | | cmake-server: Revert "Support codemodel filegroups for INTERFACE_SOURCES"Brad King2018-10-174-189/+40
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge branch 'document-dollar-in-varnames' into release-3.13Brad King2018-10-168-2/+48
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2479
| * | | | | | | | | CMP0053: document that `$` is a valid literal variable characterBen Boeckel2018-10-158-2/+48
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge branch 'update_debug_target_properties' into release-3.13Brad King2018-10-151-7/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2480
View Lorry Controller Status