summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'cpack-status-callback' into release-3.13Brad King2018-12-071-0/+10
|\ | | | | | | Merge-request: !2696
| * CPack/External: Fix status messages of staging scriptsNils Gladitz2018-12-071-0/+10
| | | | | | | | | | | | | | | | Set progress callback on cmake instance used by CPack. The progress callback is used to output STATUS messages which are otherwise missing when issued from e.g. CPack External staging scripts. Fixes: #18567
* | CUDA: Fix crash on linking to a CUDA target without CUDA enabledBrad King2018-12-053-1/+10
|/ | | | | | | | Do not try to device link or add CUDA runtime libraries if the language is not enabled. Fixes: #18673 Issue: #18614
* CMake 3.13.1v3.13.1Brad King2018-11-281-1/+1
|
* Merge branch 'autogen_uic_empty_fix_3_13' into release-3.13Brad King2018-11-271-1/+1
|\ | | | | | | Merge-request: !2667
| * Autogen: Fix empty uic executable stringSebastian Holtermann2018-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | In CMake 3.13.0 when a target has ``AUTOUIC`` enabled but doesn't link against Qt5Widgets, the uic executable string is empty and an error string "The uic executable \"\" does not exist" is generated. In CMake 3.12 ``AUTOUIC`` was silently disabled instead. This patch fixes the regression and restores the behavior of CMake 3.12. Fixes: #18630
* | Merge branch 'vs2015-no-sdk' into release-3.13Brad King2018-11-261-17/+21
|\ \ | | | | | | | | | Merge-request: !2656
| * | VS: Avoid crash with VS 2015 when all SDKs are higher than 10.0.14393.0Harry Mallon2018-11-261-17/+21
| |/ | | | | | | | | | | | | | | | | | | | | | | Move the filter added by commit v3.13.0-rc1~72^2~2 (VS: Do not select a Windows SDK too high for current VS version, 2017-08-07, committed 2018-09-17) to before our check that the remaining list is empty. Otherwise we crash when dereferencing the first entry of an empty vector. Also add a comment explaining where 10.0.14393.0 came from. Fixes: #18633
* | Fortran: Fix module dependency scanning with upper-case SUBMODULEBrad King2018-11-202-114/+114
|/ | | | | | | | The lexical token expression added by commit v3.7.0-rc1~73^2~1 (Fortran: Add support for submodule syntax in dependency scanning, 2016-09-05) has a typo and does not match upper-case `B` in `SUBMODULE`. Fix it. Fixes: #18595
* CMake 3.13.0v3.13.0Brad King2018-11-201-1/+1
|
* Merge branch 'backport-configure_file-canonical-deps' into release-3.13Brad King2018-11-191-10/+4
|\ | | | | | | Merge-request: !2635
| * configure_file: canonicalize input and output path in dependenciesFrank Benkstein2018-11-191-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Represent the input file path internally in canonical form. Otherwise multiple `configure_file` calls that share the same input file but specify it relative to different directories (e.g. via `../`) result in multiple copies of the dependency on the rule to re-run CMake. This causes the Ninja generator to emit duplicate phony build statements for these dependencies, which generates an error with `-w dupbuild=err`, which will be default in Ninja 1.9. Also canonicalize the output path for consistency. Add a test case. Fixes: #18584
* | CTest: Restore inheritance of stdin by test processesBrad King2018-11-151-1/+2
|/ | | | | | | | | | | Since commit v3.11.0-rc1~117^2 (CTest: Re-implement test process handling using libuv, 2017-12-10) we do not give the child test processes any stdin. Prior to that change we let the child test processes inherit stdin from ctest itself. Tests that run serially might be able to use the real stdin meaningfully, so restore that behavior and add a test case. Fixes: #18591
* CMake 3.13.0-rc3v3.13.0-rc3Brad King2018-11-071-1/+1
|
* Merge branch 'rename-cpack-ext-generator' into release-3.13Brad King2018-11-064-39/+41
|\ | | | | | | Merge-request: !2566
| * CPack: Rename Ext generator to ExternalCraig Scott2018-11-054-39/+41
| | | | | | | | | | Ext and External were used inconsistently in the code and the docs. This change converts all uses of Ext to External, including within variable names used by the generator.
* | Merge branch 'custom-command-work-dir-genex' into release-3.13Brad King2018-11-053-13/+6
|\ \ | | | | | | | | | Merge-request: !2559
| * | add_custom_{command,target}: Fix WORKING_DIRECTORY leading genexBrad King2018-11-033-13/+6
| |/ | | | | | | | | | | | | | | | | | | | | Since commit v3.13.0-rc1~39^2 (add_custom_{command,target}: WORKING_DIRECTORY generator expressions, 2018-09-22) the `WORKING_DIRECTORY` option accepts generator expressions. Fix support for the case of a leading generator expression by deferring conversion to an absolute path until after evaluation of the generator expression. Fixes: #18543
* | 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
generated by cgit v0.12 at 2025-01-30 17:43:37 (GMT)