summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'server-file-monitor-check' into release-3.13Brad King2018-11-011-1/+2
|\ | | | | | | Merge-request: !2556
| * server: Fix assertion failure on directory paths in file monitorVladimir Penev2018-11-011-1/+2
| | | | | | | | Fixes: #18532
* | Merge branch 'FindProtobuf-threads' into release-3.13Brad King2018-10-311-14/+22
|\ \ | | | | | | | | | Merge-request: !2551
| * | FindProtobuf: Add missing link dependencies on threadsBrad King2018-10-311-14/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protobuf headers have dependencies on threads. On UNIX platforms this requires linking to a threads library. We've long done this in the `Protobuf_LIBRARIES` result variable. However, the imported targets added by commit v3.9.0-rc1~81^2~2 (FindProtobuf: add targets, 2017-05-17) and commit v3.9.0-rc1~68^2 (FindProtobuf: Rename imported targets to match upstream names, 2017-05-22) were missing a dependency on threads. Add the dependency to the imported targets, and to the variables `Protobuf_LITE_LIBRARIES` and `Protobuf_PROTOC_LIBRARIES`. While this did not seem to matter in practice for a long time, protobuf 3.6 throws exceptions in some cases when threads are missing. Fixes: #18533
* | | Merge branch 'fix-custom-target-with-csharp' into release-3.13Brad King2018-10-319-31/+40
|\ \ \ | | | | | | | | | | | | Merge-request: !2549
| * | | CSharp: Fix regression in VS project type selection for custom targetBrad King2018-10-319-31/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A target created by `add_custom_target` should always be a `.vcxproj` file even if it has `.cs` sources involved in custom commands and such. The latter case was broken by refactoring in commit v3.12.0-rc1~160^2~7 (remove TargetIsCSharpOnly() and use methods from cmGeneratorTarget, 2018-03-19). The reason is that the `HasLanguage` method added by commit v3.12.0-rc1~239^2~6 (cmGeneratorTarget: add HasLanguage() as wrapper for GetLanguages(), 2018-03-19) does not check the target type and so is not a suitable check for deciding the project file extension. The `HasLanguage` method was an attempt at an abstraction that turns out not to work very well. Replace it with a dedicated `IsCSharpOnly` method that considers the target type, sources, and non-transitive `LINKER_LANGUAGE`. Fixes: #18515
* | | | Merge branch 'FindPostgreSQL-11' into release-3.13Brad King2018-10-311-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !2547
| * | | | FindPostgreSQL: Search for version 11Sylvain Joubert2018-10-301-2/+2
| | | | |
* | | | | Merge branch 'UseSWIG-typos' into release-3.13Brad King2018-10-291-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2542
| * | | | | UseSWIG: Add target language and input file in command descriptionSylvain Joubert2018-10-291-1/+1
| | | | | |
| * | | | | UseSWIG: Typo, add missing letterSylvain Joubert2018-10-291-1/+1
| |/ / / /
* | | | | Merge branch 'FindBoost-stacktrace' into release-3.13Brad King2018-10-291-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2541
| * | | | | FindBoost: Add support for stacktrace componentsMartin Quinson2018-10-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define the headers associated to `boost_stacktrace_*`. Fixes: #17297
* | | | | | Merge branch 'flang-preprocess-source' into release-3.13Brad King2018-10-291-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2545
| * | | | | | Flang: Fix command-line used to preprocess sourcesBrad King2018-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running flang with `-E` now ignores any `-o` option and always prints preprocessed output to stdout. Use shell redirection to place it in a file instead. Fixes: #18497
* | | | | | | Merge branch 'qccDepfile' into release-3.13Brad King2018-10-291-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2540
| * | | | | | | QNX: Update qcc depfile flags to be compliant with ccacheMaikel van den Hurk2018-10-291-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the flags to the preprocessor phase via `-Wp,`. This is accepted both by qcc and ccache.
* | | | | | | Merge branch 'cuda-filter-device-link-libs' into release-3.13Brad King2018-10-291-8/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2536
| * | | | | | | CUDA: Filter out non-static libraries during device linkingRobert Maynard2018-10-291-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.12.0-rc1~278^2 (CUDA: Pass more link libraries to device linking, 2018-03-27) we consider every link library during device linking and use `-Xnvlink` to pass those that do not end in `.a`. However, nvlink breaks on versioned shared library names such as `.so.1`. Work around this problem by not passing library paths that do not end in `.a` or `.lib`. nvlink would not find device symbols in them anyway. Fixes: #18504
* | | | | | | | Merge branch 'UseSWIG-multi-input' into release-3.13Brad King2018-10-292-2/+40
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2539
| * | | | | | | | UseSWIG: multiple input files must be supported in version 2Marc Chevrier2018-10-292-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18506
* | | | | | | | | Merge branch 'set_directory_properties-script-mode' into release-3.13Brad King2018-10-297-2/+19
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | Merge-request: !2544
| * | | | | | | | set_directory_properties: Restore in script modeBrad King2018-10-297-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.10.0-rc1~391^2~3 (Add directory property 'LABELS' and CMAKE_DIRECTORY_LABELS variable, 2017-06-23) this command was accidentally not allowed in script mode. It was dropped because `ctest -S` mode needs to start with CMake's normal script mode and then replace the `set_directory_properties` implementation. Restore the normal `set_directory_properties` in script mode and then add special logic to replace it in ctest. Also add a test case. Fixes: #18523
* | | | | | | | | Merge branch 'doc-updates' into release-3.13Brad King2018-10-264-7/+19
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | Merge-request: !2530
| * | | | | | | | Help: clarify "LINKER:" prefix usageMarc Chevrier2018-10-264-7/+19
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes: #18503
* | | | | | | | Merge branch 'FindMPI-pthread-cuda' into release-3.13Brad King2018-10-251-1/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | Merge-request: !2529
| * | | | | | | FindMPI: Pass -pthread to CUDA compiler through -XcompilerBrad King2018-10-251-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When adding this flag to imported targets, wrap it in a generator expression to use `-Xcompiler` to pass the flag for CUDA. Fixes: #17929
* | | | | | | | 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.
generated by cgit v0.12 at 2025-01-08 20:42:15 (GMT)