summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cmake-gui-vs-open-space'Brad King2018-10-251-2/+3
|\ | | | | | | | | | | | | e178bd46cb cmake-gui: Fix "Open Project" for VS IDE with space in path Acked-by: Kitware Robot <kwrobot@kitware.com> 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 topic 'cuda-thread-flags'Brad King2018-10-251-1/+18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2cc050b53b CUDA: Add test for device linking when host linking uses threads 83c13ca44f FindThreads: Pass -pthread to CUDA compiler through -Xcompiler cf92fd9ae9 Merge branch 'cuda-filter-device-link-items' into cuda-thread-flags e768d96c74 CUDA: Filter out host link flags during device linking Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kelly (KT) Thompson <kgt@lanl.gov> 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 'update-kwsys' into release-3.13Brad King2018-10-192-1/+6
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2506
| * \ \ \ Merge branch 'revert-server-iface-sources' into release-3.13Brad King2018-10-183-182/+40
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2495
| * \ \ \ \ Merge branch 'backport-revert-install-code-script-genex' into release-3.13Brad King2018-10-112-44/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2474
| * \ \ \ \ \ Merge branch 'vs-cuda-pdb' into release-3.13Brad King2018-10-101-7/+18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2473
| * \ \ \ \ \ \ Merge branch 'string-TIMESTAMP-unset-TZ' into release-3.13Brad King2018-10-091-1/+11
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2464
| * \ \ \ \ \ \ \ Merge branch 'vs-flag-map-Qspectre' into release-3.13Brad King2018-10-093-0/+11
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2462
| * \ \ \ \ \ \ \ \ Merge branch 'project-always-set-desc-url' into release-3.13Brad King2018-10-081-12/+8
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2457
| * \ \ \ \ \ \ \ \ \ Merge branch 'misc-typos' into release-3.13Brad King2018-10-043-4/+4
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2440
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'tar-warnings'Brad King2018-10-251-13/+31
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95c8a03f00 cmake: Distinguish '-E tar' warnings from errors copying data Acked-by: Kitware Robot <kwrobot@kitware.com> 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
* | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-10-251-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge topic 'vs-csharp-win32-flags'Brad King2018-10-245-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e56e8b283 VS: Fix CSharp support for win32res: and win32icon: flags Acked-by: Kitware Robot <kwrobot@kitware.com> 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 topic 'vs-csharp-in-custom-target'Brad King2018-10-241-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d004d8c59a VS: Fix crash on CSharp sources in a custom target Acked-by: Kitware Robot <kwrobot@kitware.com> 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
* | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-10-241-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-10-231-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge topic 'backtrace-gen-values'Brad King2018-10-227-153/+377
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dd4f8b2a48 install: Record TARGET mode backtraces internally 753ab3c978 Add generator APIs to get build settings with backtraces 52311484dd cmLocalGenerator: Make MoveSystemIncludesToEnd file-local Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2502
| * | | | | | | | | | | | | | install: Record TARGET mode backtraces internallyBrad King2018-10-183-33/+43
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add generator APIs to get build settings with backtracesBrad King2018-10-184-112/+329
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cmGeneratorTarget and cmLocalGenerator we offer several APIs to get build settings like include directories, compile definitions, source files, etc. Add corresponding APIs that include backtrace information.
| * | | | | | | | | | | | | | cmLocalGenerator: Make MoveSystemIncludesToEnd file-localBrad King2018-10-182-9/+6
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge topic 'update-kwsys'Brad King2018-10-222-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a833c24ceb Merge branch 'upstream-KWSys' into update-kwsys 43cb257648 KWSys 2018-10-19 (c2f29d2e) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2506
| * | | | | | | | | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-10-192-1/+6
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-10-19 (c2f29d2e)
* | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-10-221-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-10-211-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-10-201-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge topic 'target-depend-backtraces'Brad King2018-10-1921-106/+173
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dacbb41455 Track backtraces in target dependencies internally a6e02f881d add_dependencies: Track backtraces internally a093b1a4f3 cmLinkItem: Add backtrace e022e2d873 cmListFileCache: Add ExpandListWithBacktrace helper f1dd0eeaaf cmListFileCache: Add wrapper template for values with a backtrace Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2498
| * | | | | | | | | | | | | Track backtraces in target dependencies internallyBrad King2018-10-186-19/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Carry backtraces on target dependency edges to refer to the line in project code that caused the edge to appear.
| * | | | | | | | | | | | | add_dependencies: Track backtraces internallyBrad King2018-10-1811-54/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Record backtraces for "utility" dependencies created by `add_dependencies` calls.
| * | | | | | | | | | | | | cmLinkItem: Add backtraceBrad King2018-10-186-37/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Carry a backtrace on every link item, not just link implementation items. For now the non-impl items will still have empty backtraces at runtime, but this will allow us to introduce values over time.
| * | | | | | | | | | | | | cmListFileCache: Add ExpandListWithBacktrace helperBrad King2018-10-172-0/+16
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | cmListFileCache: Add wrapper template for values with a backtraceBrad King2018-10-172-1/+35
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-10-191-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge topic 'revert-server-iface-sources'Brad King2018-10-183-182/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 284a38e42f cmake-server: Revert "Support codemodel filegroups for INTERFACE_SOURCES" Acked-by: Kitware Robot <kwrobot@kitware.com> 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
* | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-10-181-1/+1
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'better-empty-list-behavior'Brad King2018-10-171-24/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 121a036f73 cmListCommand: handle empty lists for list(REMOVE_AT) acfe53c588 cmListCommand: make list(ACTION not_a_list) succeed when idempotent bf572ac952 cmListCommand: check list(FILTER) operation before the list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2478
| * | | | | | | | | | | | cmListCommand: handle empty lists for list(REMOVE_AT)Ben Boeckel2018-10-161-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treat an empty list as a list with no valid bounds and return an error message indicating that any given indices are out-of-bounds.
| * | | | | | | | | | | | cmListCommand: make list(ACTION not_a_list) succeed when idempotentBen Boeckel2018-10-161-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The operations changed here all are no-ops on empty lists anyways, so just have them succeed when given non-extant lists. - `list(REMOVE_ITEM)` - `list(REMOVE_DUPLICATES)` - `list(SORT)` - `list(FILTER)` - `list(REVERSE)`
| * | | | | | | | | | | | cmListCommand: check list(FILTER) operation before the listBen Boeckel2018-10-111-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A future commit will make the not-a-list case a success, but invalid operations should still be diagnosed in that case.
* | | | | | | | | | | | | Merge topic 'gem-string'Brad King2018-10-176-13/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b8bb6ba653 cmGeneratorTarget::GetExportMacro: return const std::string* Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2485
| * | | | | | | | | | | | | cmGeneratorTarget::GetExportMacro: return const std::string*Vitaly Stakhovsky2018-10-166-13/+15
| | | | | | | | | | | | | |