summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'relative-rpath'Brad King2018-10-262-3/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95bd6317bc RPATH: Record support for $ORIGIN on various *BSD c9b8c79271 RPATH: Record support for $ORIGIN on Haiku and Solaris 6114d85a7d RPATH: Add option for using $ORIGIN in build tree Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2456
| * | | | | | | | | | | | | RPATH: Add option for using $ORIGIN in build treePeter Wu2018-10-262-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes binaries independent of the build directory by not embedding the build directory via RPATH. The tests are partially based on the existing RuntimePath test, but with the check moved into a POST_BUILD command such that it can be skipped when the platform lacks support. Fixes: #18413
* | | | | | | | | | | | | | Merge topic 'update-kwsys'Brad King2018-10-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 533de8873a Merge branch 'upstream-KWSys' into update-kwsys 0bc20334bc KWSys 2018-10-25 (9e27254b) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2526
| * | | | | | | | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-10-251-0/+1
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-10-25 (9e27254b)
* | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-10-261-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | 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
generated by cgit v0.12 at 2025-02-01 20:21:22 (GMT)