summaryrefslogtreecommitdiffstats
path: root/Tests
Commit message (Collapse)AuthorAgeFilesLines
* CTest: exit nonzero after message(SEND_ERROR|FATAL_ERROR)Kevin Puetz2020-08-2615-3/+38
| | | | Fixes: #21004
* Merge topic 'fix-file-generate-cmp0070'Brad King2020-08-2010-1/+95
|\ | | | | | | | | | | | | | | | | | | | | 462b6d83e8 file(GENERATE): Test source properties 1977f7833b file(GENERATE): Update existing tests 04fbd7566a file(GENERATE): Fix missing check for policy CMP0070 2dc2732f67 file(GENERATE): Refactor outputFileName calculation a9602bb41e file(GENERATE): Refactor inputFileName calculation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5090
| * file(GENERATE): Test source propertiesJosef Angstenberger2020-08-199-0/+80
| | | | | | | | | | | | | | | | | | Output files get the source property `GENERATED` which is indirectly checked by adding them to a library. For a missing file that is not generated CMake will abort. With the new behavior according CMP0070 relative files are generated into the binary directory.
| * file(GENERATE): Update existing testsJosef Angstenberger2020-08-191-1/+15
| | | | | | | | | | | | | | Add the additional CMP0070 warning as expected stderr. The warning occurs twice because the output file name is evaluated multiple times.
* | Merge topic 'msvc_c11'Brad King2020-08-201-0/+9
|\ \ | | | | | | | | | | | | | | | | | | f4373feda8 Tests: Fix RunCMake.try_compile test for C standards with MSVC 19.27 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5145
| * | Tests: Fix RunCMake.try_compile test for C standards with MSVC 19.27Brad King2020-08-191-0/+9
| | | | | | | | | | | | | | | | | | | | | Since commit f7347f28c7 (MSVC: Record support for C11 and c_restrict, 2020-08-09) we know about MSVC C language standards. Update the `RunCMake.try_compile` test to be aware of this even when CMake is itself configured by an older CMake that does not know this.
| * | Merge topic 'FindPython-manage-SOABI-in-all-versions' into release-3.18Brad King2020-08-121-0/+16
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 951640f1f9 FindPython: manage SOABI for all Python versions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5119
| * \ \ Merge topic 'automoc-path-prefix-off' into release-3.18Brad King2020-08-111-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b5be34811 Help: Add 3.18.2 release note about AUTOMOC_PATH_PREFIX default change db659e18bc Merge branch 'backport-3.17-automoc-path-prefix-off' e503fbe38a Merge branch 'backport-3.16-automoc-path-prefix-off' 4c33b305a0 Autogen: Turn off moc path prefix generation by default 56510b7d85 Merge branch 'backport-test-FindPkgConfig-isolate-env' into release-3.17 effc9a1032 Merge branch 'backport-3.17-automoc_timestamp_deps' into release-3.17 507fecd7e2 Merge branch 'ninja-multi-rsp-remove-path' into release-3.17 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5105
* | \ \ \ Merge topic 'ExternalProject-retry-only-recoverable'Brad King2020-08-199-0/+114
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 116b06870d ExternalProject: add INACTIVITY_TIMEOUT argument f24e34975a ExternalProject: retry download on recoverable errors Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5034
| * | | | ExternalProject: add INACTIVITY_TIMEOUT argumentThomas Bernard2020-08-186-0/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to abort transfers on slow connections the ExternalProject command support passing the INACTIVITY_TIMEOUT argument. Fixes: #20992
| * | | | ExternalProject: retry download on recoverable errorsThomas Bernard2020-08-114-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to shorten the download failure of ExternalProject download steps, a download retry is only done when a recoverable network error is encountered.
* | | | | Merge topic 'FixGraphvizAliasTargets'Brad King2020-08-1818-0/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7dd74e4ef Graphviz: Fix bug that shows duplicated alias targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5134
| * | | | | Graphviz: Fix bug that shows duplicated alias targetsStephan Rohmen2020-08-1718-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | When using subdirectories the alias targets were duplicated
* | | | | | Merge topic 'add_test-special-chars-in-name'Brad King2020-08-17101-0/+286
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a20987732b add_test: Allow special characters in test name (w/ policy CMP0110) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5076
| * | | | | | add_test: Allow special characters in test name (w/ policy CMP0110)Deniz Bahadir2020-08-12101-0/+286
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore the change from commit f84af8e270 (add_test: Allow special characters in test name, 2020-05-16, v3.18.0-rc1~142^2) that had to be reverted by commit f84af8e270 (add_test: Allow special characters in test name, 2020-05-16, v3.18.0-rc1~142^2) for compatibility. Add policy CMP0110 to make the change in a compatible way. Also, support even more characters than before by generating the test scripts using bracket arguments around the test names. Fixes: #19391 Signed-off-by: Deniz Bahadir <dbahadir@benocs.com>
* | | | | | Merge topic 'FindX11-xcb-util-xfixes'Brad King2020-08-172-0/+52
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d231b494f FindX11: Add xcb_util and xcb_xfixes libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5116
| * | | | | | FindX11: Add xcb_util and xcb_xfixes librariesTim Blechmann2020-08-122-0/+52
| | | | | | |
* | | | | | | Merge topic 'xcode12-link-matching-zlib'Brad King2020-08-171-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 862dbe1367 Xcode: Link matching zlib for iOS Simulator SDK Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5125
| * | | | | | | Xcode: Link matching zlib for iOS Simulator SDKGregor Jasny2020-08-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The XcodeRemoveExcessiveISystem test runs `find_package(ZLIB)` which returns an SDK-relative path to `zlib.tlb`. When the test switches the SDK for building to something different than the SDK used for configuration the linker rightfully complains about the mismatch. The fix is to configure and build with the same SDK.
* | | | | | | | Merge topic 'ios-combined-prune-archs'Brad King2020-08-172-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5852b8867f CMakeIOSInstallCombined: Enforce disjoint architecture sets 79098d23eb Tests: Avoid warnings about unused arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5111
| * | | | | | | Tests: Avoid warnings about unused argumentsGregor Jasny2020-08-082-2/+2
| | | | | | | |
* | | | | | | | Merge topic 'optimize-static-library-deps'Kyle Edwards2020-08-1337-0/+296
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2e42651dff Add option to optimize link dependencies for static libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5103
| * | | | | | | Add option to optimize link dependencies for static librariesKyle Edwards2020-08-1237-0/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an `OPTIMIZE_DEPENDENCIES` target property and supporting `CMAKE_OPTIMIZE_DEPENDENCIES` variable to optionally enable pruning and flattening of outgoing dependencies from static libraries. Since they do not actually link, they only depend on side effects of their dependencies. Therefore we can drop dependencies that contribute no side effects.
* | | | | | | | Merge topic 'FindPython-manage-SOABI-in-all-versions'Brad King2020-08-121-0/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | 951640f1f9 FindPython: manage SOABI for all Python versions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5119
| * | | | | | FindPython: manage SOABI for all Python versionsMarc Chevrier2020-08-111-0/+16
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Fixes: #21070
| * | | | | Merge topic 'FindPython-user-policies' into release-3.18Brad King2020-08-101-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a92d384548 FindPython: ensure user's policies are respected Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Henry Schreiner <henryschreineriii@gmail.com> Merge-request: !5098
* | \ \ \ \ \ Merge topic 'bootstrap-ninja'Brad King2020-08-112-2/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 491dddfbde Bootstrap: Add support for Ninja Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3652
| * | | | | | | Bootstrap: Add support for NinjaKyle Edwards2020-08-102-2/+6
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge topic 'automoc-path-prefix-off'Brad King2020-08-111-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b5be34811 Help: Add 3.18.2 release note about AUTOMOC_PATH_PREFIX default change db659e18bc Merge branch 'backport-3.17-automoc-path-prefix-off' e503fbe38a Merge branch 'backport-3.16-automoc-path-prefix-off' 4c33b305a0 Autogen: Turn off moc path prefix generation by default Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5105
| * | | | | Merge branch 'backport-3.17-automoc-path-prefix-off'Brad King2020-08-101-0/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Merge branch 'backport-3.16-automoc-path-prefix-off'Brad King2020-08-101-0/+1
| | |\ \ \ \
| | | * | | | Autogen: Turn off moc path prefix generation by defaultJoerg Bornemann2020-08-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default value of `CMAKE_AUTOMOC_PATH_PREFIX` to `OFF` to restore compatibility with behavior of CMake 3.15 and below. C++ source files that are generated by Qt's meta object compiler (moc) include the header file that was passed as input argument to moc. This is usually a path relative to the source directory, for example #include "../../source/dir/myobject.h" That is problematic for reproducible builds as described in #18815. To cope with that, the target property AUTOMOC_PATH_PREFIX was introduced in CMake 3.16 by commit d018d27c10 (Autogen: Add moc path prefix generation (AUTOMOC_PATH_PREFIX), 2019-09-13, v3.16.0-rc1~94^2~4). The property is default-initialized from the variable `CMAKE_AUTOMOC_PATH_PREFIX`, which defaults to `ON`. If this property is ON, and myobject.h is located in an include directory of the target, moc-generated C++ files include the file without the "path prefix": #include "myobject.h" This behavior, however, can break projects that have equally named header files in different include directories. As "not breaking existing projects" trumps "have reproducible builds by default" we change the default of `CMAKE_AUTOMOC_PATH_PREFIX` to `OFF`. Also, it is now possible to pass `-DCMAKE_AUTOMOC_PATH_PREFIX=ON` on the CMake command line. Before, it was overridden in `CMakeGenericSystem`. Fixes: #20598 Issue: #18815
| | * | | | | Merge branch 'backport-test-FindPkgConfig-isolate-env' into release-3.17Brad King2020-08-071-0/+5
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !5108
| | | * | | | | Tests: Isolate RunCMake.FindPkgConfig from caller environmentBrad King2020-08-071-0/+5
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid interference from `CMAKE_PREFIX_PATH` and friends if they happen to be set in the environment from which the tests are run.
| | | * | | | Merge branch 'backport-3.16-pch-fix-bad-ClearSourcesCache' into release-3.16Brad King2020-05-291-2/+5
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4815
| | | * \ \ \ \ Merge branch 'vs-pch-compile-opts' into release-3.16Brad King2020-05-111-0/+3
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4734
| | | * \ \ \ \ \ Merge branch 'backport-3.16-FindPkgConfig-isystem' into release-3.16Brad King2020-05-061-1/+21
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4693
| | | * \ \ \ \ \ \ Merge branch 'CheckLanguage-cuda-host' into release-3.16Brad King2020-05-051-9/+9
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4711
| * | | \ \ \ \ \ \ \ Merge topic 'test-FindPkgConfig-isolate-env' into release-3.18Brad King2020-08-101-0/+5
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b12982653 Merge branch 'backport-test-FindPkgConfig-isolate-env' 4c939b0d39 Tests: Isolate RunCMake.FindPkgConfig from caller environment 20eeb40aaf Tests: Isolate RunCMake.FindPkgConfig from caller environment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5108
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'build-interface-targets'Brad King2020-08-1049-68/+452
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bafa9fe887 fileapi: Add INTERFACE libraries with SOURCES to codemodel-v2 4391913133 Add INTERFACE libraries to generated buildsystem if they have SOURCES afb998704e Remove filtering of allowed INTERFACE library properties e7edba2baf Makefiles: Use IsInBuildSystem in global generator target type checks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5078
| * | | | | | | | | | | | fileapi: Add INTERFACE libraries with SOURCES to codemodel-v2Brad King2020-08-0712-1/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | INTERFACE libraries with SOURCES now appear in the generated buildsystem, so include them in the codemodel output too. We do not need to bump the `codemodel-v2` object kind minor version because that was already done in post-3.18 development by commit 7d6861f367 (fileapi: Extend codemodel targets with language standard, 2020-06-18). Fixes: #18608
| * | | | | | | | | | | | Add INTERFACE libraries to generated buildsystem if they have SOURCESBrad King2020-08-0734-21/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | INTERFACE libraries were created with the intention of collecting usage requirements for use by other targets via `target_link_libraries`. Therefore they were not allowed to have SOURCES and were not included in the generated buildsystem. In practice, this has become limiting: * Header-only libraries do have sources, they just do not compile. Developers should be able to edit those sources (the header files) in their IDE. * Header-only libraries may need to generate some of their header files via custom commands. Some projects work around these limitations by pairing each interface library with an `add_custom_target` that makes the header files and custom commands appear in the generated buildsystem and in IDEs. Lift such limitations by allowing INTERFACE libraries to have SOURCES. For those with sources, add a corresponding build target to the generated buildsystem. Fixes: #19145
| * | | | | | | | | | | | Remove filtering of allowed INTERFACE library propertiesBrad King2020-08-034-46/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we disallowed use of arbitrary properties on INTERFACE libraries. The goal was to future-proof projects using them by not allowing properties to be set that may affect their future inclusion in the generated buildsystem. In order to prepare to actually include INTERFACE libraries in the generated buildsystem, drop the filter and allow arbitrary properties to be set. Issue: #19145
* | | | | | | | | | | | | Merge topic 'runcmake-make-english'Brad King2020-08-101-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3d2ab71d42 Tests: Set LC_MESSAGES for RunCMake.Make Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5114
| * | | | | | | | | | | | | Tests: Set LC_MESSAGES for RunCMake.MakeKyle Edwards2020-08-081-0/+3
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LANG was already set, but is not enough on some systems. Set LC_MESSAGES too.
* | | | | | | | | | | | | Merge topic 'clang-cl-vfs'Brad King2020-08-101-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20ebaed972 Clang: Add support for passing VFS arguments d993ebd4ca clang-cl: Add '--' before source file a94672b919 cmake: Change cmake_llvm_rc separator from -- to ++ to avoid conflict Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5087
| * | | | | | | | | | | | | cmake: Change cmake_llvm_rc separator from -- to ++ to avoid conflictThomas Bernard2020-08-071-4/+4
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'FindPython-user-policies'Brad King2020-08-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a92d384548 FindPython: ensure user's policies are respected Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Henry Schreiner <henryschreineriii@gmail.com> Merge-request: !5098
| * | | | | | | | | | | | FindPython: ensure user's policies are respectedMarc Chevrier2020-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not set the policy version before recording our internal macros such as `__Python_add_library`. Otherwise callers get our policy version instead of theirs. Instead just set the specific policies we need. Also fix one case in our test suite where we were accidentally relying on the policy version to be set by `FindPython`. Fixes: #21042
* | | | | | | | | | | | | Merge topic 'test-FindPkgConfig-isolate-env'Brad King2020-08-101-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | / / / / / / / / | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b12982653 Merge branch 'backport-test-FindPkgConfig-isolate-env' 4c939b0d39 Tests: Isolate RunCMake.FindPkgConfig from caller environment 20eeb40aaf Tests: Isolate RunCMake.FindPkgConfig from caller environment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5108