summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2018-11-071-1/+1
|
* Merge topic 'autogen_origin_depends'Brad King2018-11-063-3/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | 47f9c15c60 Autogen: Update <ORIGIN>_autogen target documentation 336893d9eb Autogen: Separate AUTOGEN_TARGET_DEPENDS tests into own tests suite 846043dd35 Autogen: Rename MocDepends test to AutogenOriginDependsOn b71a9598a4 Autogen: Add test for AUTOGEN_ORIGIN_DEPENDS=OFF f74c406501 Autogen: Add (CMAKE_)AUTOGEN_ORIGIN_DEPENDS release notes 0669de5d36 Autogen: Add (CMAKE_)AUTOGEN_ORIGIN_DEPENDS documentation b5e895b5d4 Autogen: Add (CMAKE_)AUTOGEN_ORIGIN_DEPENDS support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2518
| * Autogen: Add (CMAKE_)AUTOGEN_ORIGIN_DEPENDS supportSebastian Holtermann2018-11-033-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds - the variable ``CMAKE_AUTOGEN_ORIGIN_DEPENDS`` which initializes - the target property ``AUTOGEN_ORIGIN_DEPENDS`` which controls whether or not the origin target dependencies should be forwarded to the corresponding ``_autogen`` target. The default value of ``CMAKE_AUTOGEN_ORIGIN_DEPENDS`` is ``ON`` which corresponds to the behavior that is in place since CMake 3.9. Closes: #18493
* | Merge topic 'rename-cpack-ext-generator'Brad King2018-11-064-39/+41
|\ \ | | | | | | | | | | | | | | | | | | 20d5e77a27 CPack: Rename Ext generator to External Acked-by: Kitware Robot <kwrobot@kitware.com> 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.
* | | CMake Nightly Date StampKitware Robot2018-11-061-1/+1
| | |
* | | Merge topic 'lwyu-hides-link-error'Brad King2018-11-051-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 85aceda026 cmNinjaNormalTargetGenerator: don't use `|| true` for link-what-you-use Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2546
| * | | cmNinjaNormalTargetGenerator: don't use `|| true` for link-what-you-useBen Boeckel2018-11-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the `|| true`, a linker error before running link-what-you-use would also use the `|| true` fragment and unconditionally succeed. Just skip the addition since `--lwyu=` ignores the return value anyways. Fixes #18524
* | | | Merge topic 'custom-command-work-dir-genex'Brad King2018-11-053-13/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98d59417b0 add_custom_{command,target}: Fix WORKING_DIRECTORY leading genex Acked-by: Kitware Robot <kwrobot@kitware.com> 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
* | | | CMake Nightly Date StampKitware Robot2018-11-051-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-11-041-1/+1
| |_|/ |/| |
* | | CMake Nightly Date StampKitware Robot2018-11-031-1/+1
| | |
* | | Merge topic 'msvc-custom-rc-mt'Brad King2018-11-023-4/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd9bfc6449 MSVC: Respect CMAKE_RC_COMPILER and CMAKE_MT in vs_link_{dll,exe} 0033676796 CUDA: Enable RC language on Windows 02f566a559 MSVC: Factor out enable_language(RC) call into helper macro b601bb6f1c CUDA: Find CMAKE_LINKER on Windows 3eebe28ef4 cmLocalNinjaGenerator: Simplify CreateRulePlaceholderExpander Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2424
| * | | MSVC: Respect CMAKE_RC_COMPILER and CMAKE_MT in vs_link_{dll,exe}Mateusz Zych2018-10-292-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake commands vs_link_dll and vs_link_exe, performing linking on MSVC, are responsible for calling resource compiler and manifest tool. Before this commit, both of these tools were called directly, with the expectation that they are available in the `PATH`. This has been fixed by respecting CMake variables `CMAKE_RC_COMPILER` and `CMAKE_MT` defining paths to these tools. Fixes: #17804
| * | | cmLocalNinjaGenerator: Simplify CreateRulePlaceholderExpanderMateusz Zych2018-10-261-2/+2
| | | | | | | | | | | | | | | | Re-use the derived class implementation instead of duplicating it.
* | | | Merge topic 'check-keywords-only-if-used'Brad King2018-11-021-10/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4babc9058a cmTargetPropCommandBase: check keywords after parsing 45a49ae58a cmTargetPropCommandBase: simplify code path 9f64974f5e cmTargetPropCommandBase: skip property setting if there's nothing to add 4201a11c2b Tests: add tests for empty-value keyword arguments in target_* Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2514
| * | | | cmTargetPropCommandBase: check keywords after parsingBen Boeckel2018-10-261-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following was disallowed: add_library(iface INTERFACE) target_link_libraries(iface PUBLIC) just due to the mention of the `PUBLIC` keyword. Instead, only error if there are actually `PUBLIC` dependencies specified (and analogously for other restrictions). Update tests to expect this new behavior.
| * | | | cmTargetPropCommandBase: simplify code pathBen Boeckel2018-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | The outside of the loop does the same return expression.
| * | | | cmTargetPropCommandBase: skip property setting if there's nothing to addBen Boeckel2018-10-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some target types don't allow setting certain properties even if there is no value being set there. Guard against this by avoiding property setting when there is nothing to add.
* | | | | Merge topic 'server-file-monitor-check'Brad King2018-11-021-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb52529ff4 server: Fix assertion failure on directory paths in file monitor Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2556
| * | | | | server: Fix assertion failure on directory paths in file monitorVladimir Penev2018-11-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18532
* | | | | | CMake Nightly Date StampKitware Robot2018-11-021-1/+1
| | | | | |
* | | | | | Merge topic 'fix-custom-target-with-csharp'Brad King2018-11-015-29/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9040df31e2 Merge branch 'backport-fix-custom-target-with-csharp' 1acd1c2b50 CSharp: Fix regression in VS project type selection for custom target a56edad6d6 CSharp: Fix regression in VS project type selection for custom target Acked-by: Kitware Robot <kwrobot@kitware.com> 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
* | | | | | | CMake Nightly Date StampKitware Robot2018-11-011-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-10-311-1/+1
| | | | | | |
* | | | | | | Merge topic 'cuda_device_linking_drop_dynamic_libs'Brad King2018-10-301-8/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8cc8d22d8 Merge branch 'backport-cuda-filter-device-link-libs' 3f5bfb425a CUDA: Filter out non-static libraries during device linking 3c31ec7a0a CUDA: Filter out non-static libraries during device linking Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de> 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
| * | | | | | 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
| * \ \ \ \ \ \ Merge branch 'cuda-thread-flags' into release-3.13Brad King2018-10-241-1/+18
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2512
| * \ \ \ \ \ \ \ Merge branch 'tar-warnings' into release-3.13Brad King2018-10-241-13/+31
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | Merge-request: !2519
| * | | | | | | | Merge branch 'vs-csharp-win32-flags' into release-3.13Brad King2018-10-235-10/+10
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2516
| * \ \ \ \ \ \ \ \ Merge branch 'vs-csharp-in-custom-target' into release-3.13Brad King2018-10-231-0/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2515
* | \ \ \ \ \ \ \ \ \ Merge topic 'set_directory_properties-script-mode'Brad King2018-10-304-2/+14
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 50572d638b set_directory_properties: Restore in script mode Acked-by: Kitware Robot <kwrobot@kitware.com> 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 Nightly Date StampKitware Robot2018-10-301-1/+1
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'graphviz-fix-alias'Brad King2018-10-293-8/+31
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 50c4dec072 graphviz: dereference ALIAS targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2521
| * | | | | | | | | | | | graphviz: dereference ALIAS targetsNick Schultz2018-10-263-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous behavior treats ALIAS targets as external targets. This fix de-aliases these targets to their pointed target. Fixes: #15636
* | | | | | | | | | | | | Merge topic 'minusCparse'Brad King2018-10-291-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 379e5f93a9 Tests: Add cases for -{C,D,U} without a source tree 5873815fef cmake: distinguish '-Cpath' from '-C path' in source dir parsing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2517
| * | | | | | | | | | | | | cmake: distinguish '-Cpath' from '-C path' in source dir parsingPaul Seyfert2018-10-261-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This results in the correct source directory being picked up in calls with cmake sourcedir -C settings and in a more appropriate error message when calling mkdir build ; cd build ; cmake -C settings Also fix `-D` and `-U` in the same way.
* | | | | | | | | | | | | | Merge topic 'appdef-stdstring'Brad King2018-10-294-17/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b2c85cb698 cmLocalGenerator::AppendDefines: Remove const char* overloads Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2533
| * | | | | | | | | | | | | | cmLocalGenerator::AppendDefines: Remove const char* overloadsVitaly Stakhovsky2018-10-264-17/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accept const std::string& arguments only
* | | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-10-291-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-10-281-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-10-271-1/+1
| | | | | | | | | | | | | | |