summaryrefslogtreecommitdiffstats
path: root/Source
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 'fix-custom-target-with-csharp' into release-3.13Brad King2018-10-315-29/+25
|\ \ | | | | | | | | | Merge-request: !2549
| * | CSharp: Fix regression in VS project type selection for custom targetBrad King2018-10-315-29/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '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 'set_directory_properties-script-mode' into release-3.13Brad King2018-10-294-2/+14
|\ \ \ \ | |/ / / |/| | | | | | | Merge-request: !2544
| * | | set_directory_properties: Restore in script modeBrad King2018-10-294-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | CMake 3.10.3v3.10.3Brad King2018-03-161-1/+1
| | | |
| * | | Merge branch 'ccmake-stack-smashing' into release-3.10Brad King2018-03-131-1/+1
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !1836
| * | | | Autogen: Fix for the empty source file crash in 3.10.2Sebastian Holtermann2018-03-091-7/+13
| | | | | | | | | | | | | | | | | | | | Issue: #17793
* | | | | CMake 3.13.0-rc2v3.13.0-rc2Brad King2018-10-251-1/+1
| | | | |
* | | | | 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 'cuda-thread-flags' into release-3.13Brad King2018-10-241-1/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2512
| * \ \ \ \ \ 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
| * | | | | CMake 3.12.3v3.12.3Brad King2018-10-031-1/+1
| | | | | |
| * | | | | Merge branch 'fix-csharp-target-type' into release-3.12Brad King2018-10-023-6/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2427
| * \ \ \ \ \ Merge branch 'fix-ctest_start-track' into release-3.12Brad King2018-09-101-2/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2366
* | \ \ \ \ \ \ 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-231-0/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | Merge-request: !2515
| * | | | | | | VS: Fix crash on CSharp sources in a custom targetBrad King2018-10-231-0/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The target generator does not compute ClOptions for custom targets, so we should not use them either. Fixes: #18377, #18485
* | | | | | | 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)
* | | | | | | Merge branch 'revert-server-iface-sources' into release-3.13Brad King2018-10-183-182/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2495
| * | | | | | | cmake-server: Revert "Support codemodel filegroups for INTERFACE_SOURCES"Brad King2018-10-173-182/+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 'backport-revert-install-code-script-genex' into release-3.13Brad King2018-10-112-44/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2474
| * | | | | | | install: Revert CODE,SCRIPT support for generator expressionsBrad King2018-10-112-44/+9
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge branch 'vs-cuda-pdb' into release-3.13Brad King2018-10-101-7/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2473
| * | | | | | | VS: Add workaround for CUDA compiler PDB location with spaceBrad King2018-10-101-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | VS: Drop workaround for CUDA compiler PDB location on CUDA 9.2+Brad King2018-10-101-7/+11
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge branch 'string-TIMESTAMP-unset-TZ' into release-3.13Brad King2018-10-091-1/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2464
| * | | | | | | string(TIMESTAMP): Fix unset TZJose Luis Blanco-Claraco2018-10-091-1/+11
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic added by commit v3.6.0-rc1~338^2 (CMake: Extend TIMESTAMP sub-commands with new unix time format specifier, 2016-02-16) to restore the `TZ` environment variable does not properly handle the case in which the variable was originally not set. Unset the variable in this case. Fixes: #18431
* | | | | | | Merge branch 'vs-flag-map-Qspectre' into release-3.13Brad King2018-10-093-0/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2462
| * | | | | | | VS: Add flag table entry for -QspectreBrad King2018-10-083-0/+11
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add special logic to map this flag to a top-level build setting instead of being in ClCompile. Fixes: #18426
* | | | | | | Merge branch 'project-always-set-desc-url' into release-3.13Brad King2018-10-081-12/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2457
| * | | | | | | project(): Ensure DESCRIPTION and HOMEPAGE_URL variables are setCraig Scott2018-10-071-12/+8
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a project() call does not have DESCRIPTION or HOMEPAGE_URL options, it must still set the relevant variables or else those variables will inherit values from an earlier project() call. That is inconsistent with how VERSION is handled and is likely to be unexpected. The docs were also ambiguous about what should happen in such cases.
* | | | | | | Merge branch 'misc-typos' into release-3.13Brad King2018-10-043-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2440
| * | | | | | | Fix misc. typosluz.paz2018-10-033-4/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Found via `codespell -q 3 -I ../cmake-whitelist.txt --skip="./Utilities"` where the whitelist consists of ``` aci ans behaviour buil convertor dum earch ect emmited emmitted helpfull iff isnt ith lowercased mose nd nknown nto objext ot pathes pevents splitted substract superceded supercedes te tim todays uint upto whitespaces ```
* | | | | | | CMake 3.13.0-rc1 version updateBrad King2018-10-031-3/+3
|/ / / / / /
* | | | | | Merge topic 'ctest-num-width'Brad King2018-10-031-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d28884617 cmCTestRunTest: Avoid float/int conversions in number width logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2433
| * | | | | | cmCTestRunTest: Avoid float/int conversions in number width logicBrad King2018-10-021-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use of `std::log10` added by commit 02c5091c90 (cmCTestRunTest: Simplify number width computation, 2018-09-08) broke our number width computation on some platforms where static_cast<int>(std::log10(static_cast<size_t>(10))) somehow produces `0` instead of `1`. Re-implement the logic to avoid floating-point computations.
* | | | | | | Merge topic 'update-kwsys'Brad King2018-10-031-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0da3340b9c Merge branch 'upstream-KWSys' into update-kwsys b6a689c6f8 KWSys 2018-10-03 (9d6873b1) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2437
| * | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-10-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-10-03 (9d6873b1)
* | | | | | | | Merge topic 'fix-csharp-target-type'Brad King2018-10-033-6/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 375b420fdf CSharp: Fix regression in VS project type selection 8b21aa0af0 VS: Fix CSharp flag selection when linking to a static C++ library Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2427
| * | | | | | CSharp: Fix regression in VS project type selectionBrad King2018-10-022-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A that target contains only `.cs` sources should be generated as a `.csproj` project even if it links to non-CSharp static libraries. 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) enforces its "exclusive" check on the combined set of source file languages and the link language. To restore the original `TargetIsCSharpOnly` semantics, update `HasLanguage` to enforce exclusiveness only on the list of sources. Fixes: #18239
generated by cgit v0.12 at 2025-01-08 00:38:46 (GMT)