summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cmake-ctest-arguments'Brad King2020-01-177-0/+39
|\ | | | | | | | | | | | | 4153d8445b Add CMAKE_CTEST_ARGUMENTS variable to pass command-line arguments to ctest Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4168
| * Add CMAKE_CTEST_ARGUMENTS variable to pass command-line arguments to ctestRobert Goulet2020-01-157-0/+39
| | | | | | | | Fixes: #20172
* | Merge topic 'rename-cross-config-variable'Brad King2020-01-176-22/+26
|\ \ | | | | | | | | | | | | | | | | | | 310b58e961 Ninja Multi-Config: Rename variable to be more consistent Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4234
| * | Ninja Multi-Config: Rename variable to be more consistentKyle Edwards2020-01-166-22/+26
| | | | | | | | | | | | Also make some tweaks to the documentation.
* | | Merge topic 'feature/cmSourceFile-avoid-unnecessary-copy'Brad King2020-01-171-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5da3d01fd1 cmSourceFile: avoid unnnecessary copies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4233
| * | | cmSourceFile: avoid unnnecessary copiesTim Blechmann2020-01-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | the copies in `cmSourceFile::FindFullPath` are one of the hotspots of my build system: we can easily avoid them by capturing by reference instead of by value
* | | | Merge topic 'csharp-default-langversion'Brad King2020-01-171-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2e882b4275 CSharp: Set C# compiler to default version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4232
| * | | | CSharp: Set C# compiler to default versionSumit Bhardwaj2020-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the hard-coded ``/langversion:3`` option and let the compiler choose the default language version automatically as documented at https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/configure-language-version Fixes: #17674
* | | | | Merge branch 'release-3.16'Brad King2020-01-170-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'findopenssl-dependencies-link-order' into release-3.16Brad King2020-01-171-7/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2880aaa06 FindOpenSSL: Fix ordering of dependency link flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4235
* | \ \ \ \ \ Merge topic 'findopenssl-dependencies-link-order'Brad King2020-01-170-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2880aaa06 FindOpenSSL: Fix ordering of dependency link flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4235
| * | | | | | FindOpenSSL: Fix ordering of dependency link flagsAshley Whetter2020-01-161-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20082, #20224
* | | | | | | Merge topic 'cpack-custom-dmg-names'Craig Scott2020-01-1710-1/+94
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d6f4b9316 CPack/DragNDrop: Support CPACK_DMG_<component>_FILE_NAME b53230fbee Tests: Add DragNDrop as a testable CPack generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4227
| * | | | | | | CPack/DragNDrop: Support CPACK_DMG_<component>_FILE_NAMEAndrew Fuller2020-01-166-1/+26
| | | | | | | |
| * | | | | | | Tests: Add DragNDrop as a testable CPack generatorAndrew Fuller2020-01-164-0/+68
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-01-171-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'release-3.16'Brad King2020-01-160-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge topic 'nag-submodule' into release-3.16Brad King2020-01-162-2/+8
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7f60ddcf9 Fortran: Add support for NAG Fortran submodules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4229
* | \ \ \ \ \ \ \ Merge topic 'nag-submodule'Brad King2020-01-162-2/+8
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7f60ddcf9 Fortran: Add support for NAG Fortran submodules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4229
| * | | | | | | | Fortran: Add support for NAG Fortran submodulesNeil Carlson2020-01-152-2/+8
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They use a `.sub` extension. Fixes: #20220
* | | | | | | | Merge topic 'cpack-nsis-test'Brad King2020-01-161-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b796749ba8 Tests: Fix CPackNSISGenerator test on non-x86 Windows platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4230
| * | | | | | | | Tests: Fix CPackNSISGenerator test on non-x86 Windows platformsBrad King2020-01-151-1/+1
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit ebfffc609e (CPack/NSIS: Add option for setting MUI_HEADERIMAGE_BITMAP, 2020-01-02) this test was added but only globbed for 32-bit windows packages. Fix the test to glob for packages of any architecture.
* | | | | | | | Merge topic 'pch_job_pool'Brad King2020-01-168-1/+48
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97c124e30f Ninja: Add a separate job pool for PCH creation ebd0b16ddb vim: Add target_precompile_headers command highlighting Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Cristian Adam <cristian.adam@gmail.com> Merge-request: !4224
| * | | | | | | | Ninja: Add a separate job pool for PCH creationDan Johnston2020-01-168-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `JOB_POOL_PRECOMPILE_HEADER` target property to specify the pool name, and its associated `CMAKE_JOB_POOL_PRECOMPILE_HEADER` variable. Fixes: #20217
| * | | | | | | | vim: Add target_precompile_headers command highlightingDan Johnston2020-01-161-0/+7
| | | | | | | | |
* | | | | | | | | Merge topic 'file_download_filename'Brad King2020-01-164-17/+72
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c0da651c09 file(DOWNLOAD): Don't fail if given just a filename to write to b56d429324 Tests: Fix CMake.FileDownload test failures not reported 3bc73803b4 Tests: Fix CMake.FileDownload test in presence of proxy 1352585301 Tests: Extend CMake.FileDownload test internal timeouts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4159
| * | | | | | | | file(DOWNLOAD): Don't fail if given just a filename to write toJohnny Jazeix2020-01-153-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17969
| * | | | | | | | Tests: Fix CMake.FileDownload test failures not reportedCraig Scott2020-01-152-5/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the PASS_REGULAR_EXPRESSION test property is set, the exit code of the test is ignored, so we can't just rely on using message(SEND_ERROR) or the command itself failing. We have to add an explicit error message for all unexpected status codes and check for such messages with a FAIL_REGULAR_EXPRESSION.
| * | | | | | | | Tests: Fix CMake.FileDownload test in presence of proxyBrad King2020-01-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not actually need to contact any real http servers. The one attempt we make is to an intentionally bad domain name. Unset any proxy configuration that may change behavior.
| * | | | | | | | Tests: Extend CMake.FileDownload test internal timeoutsBrad King2020-01-151-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On a busy machine running many tests in parallel the `file(DOWNLOAD)` step can take longer than 2 seconds even to simply copy a file. Raise the timeout to 4 seconds to reduce spurious failures.
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-01-161-1/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge topic 'add_cuda_toolkit_tests'Brad King2020-01-1516-12/+488
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e474364d1 CUDAToolkit: No targets now depend on the CUDA runtime 907bb7df57 CUDAToolkit: Gracefully handle missing SDK components e500eb80cd CUDAToolkit: add_cuda_link_dependency correctly sets dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4183
| * | | | | | | | CUDAToolkit: No targets now depend on the CUDA runtimeRobert Maynard2020-01-1416-5/+480
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not a requirement to have shared|static consistent across your CUDA libraries (e.g curand, nppc ) and your CUDA runtime library. It is entirely allowable to use a static nppc and a shared runtime.
| * | | | | | | | CUDAToolkit: Gracefully handle missing SDK componentsRobert Maynard2020-01-061-7/+8
| | | | | | | | |
| * | | | | | | | CUDAToolkit: add_cuda_link_dependency correctly sets dependenciesRobert Maynard2020-01-031-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'release-3.16'Brad King2020-01-150-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'unity-lang-filename' into release-3.16Brad King2020-01-1512-16/+16
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 274a6f3699 Unity Build: include language in generated source file name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4223
* | \ \ \ \ \ \ \ \ Merge topic 'unity-lang-filename'Brad King2020-01-1512-16/+16
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 274a6f3699 Unity Build: include language in generated source file name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4223
| * | | | | | | | | Unity Build: include language in generated source file nameCristian Adam2020-01-1412-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20206
* | | | | | | | | | Merge branch 'release-3.16'Brad King2020-01-150-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'python39' into release-3.16Brad King2020-01-153-3/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6474214b3 FindPython: Add support for version 3.9 Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Marc Chevrier <marc.chevrier@gmail.com> Acked-by: Björn Esser <besser82@fedoraproject.org> Merge-request: !4225
* | | | | | | | | | Merge topic 'python39'Brad King2020-01-153-3/+3
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6474214b3 FindPython: Add support for version 3.9 Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Marc Chevrier <marc.chevrier@gmail.com> Acked-by: Björn Esser <besser82@fedoraproject.org> Merge-request: !4225
| * | | | | | | | | FindPython: Add support for version 3.9Miro Hrončok2020-01-143-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Development versions of Python 3.9.0 are already out there. See PEP 596 -- Python 3.9 Release Schedule: https://www.python.org/dev/peps/pep-0596/
* | | | | | | | | | Merge topic 'ctest-timeout-on-pipe'Brad King2020-01-158-3/+90
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1976cd1f2 CTest: Fix timeout when grandchild keeps pipes open 2f5eb1800b Tests: Add RunCMake.CTestTimeout test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4217
| * | | | | | | | | | CTest: Fix timeout when grandchild keeps pipes openBrad King2020-01-144-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a test's process creates its own child and exits, the grandchild may keep pipes open. Fix CTest logic to correctly timeout if the grandchild does not exit and close the pipes before the timeout expires. This was broken by commit b5e21d7d2e (CTest: Re-implement test process handling using libuv, 2017-12-10, v3.11.0-rc1~117^2) which added an unnecessary condition to the timeout handling. Fixes: #20116
| * | | | | | | | | | Tests: Add RunCMake.CTestTimeout testBrad King2020-01-146-0/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test will consolidate CTest timeout-related tests.
* | | | | | | | | | | Merge topic 'cmake-self-rpath'Brad King2020-01-151-37/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d92bf9e84f Enable RPATH for CMake's own binaries by default Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4222
| * | | | | | | | | | | Enable RPATH for CMake's own binaries by defaultBrad King2020-01-141-37/+7
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile the changes made by: * commit ae62f66033 (ENH: CMake does not need RPATHs at all for its own executables, 2006-03-01, v2.4.0~380) * commit a056cffc5b (COMP: enable RPATH if any of the CMAKE_USE_SYSTEM_XXX variables is enabled, 2007-08-28, v2.6.0~1183) * commit c0108d1e07 (COMP: use RPATH is building QtDialog and the Qt libs are not in /lib or /usr/lib, 2007-11-05, v2.6.0~915) The overall goal of those changes was to get the RPATH set for external libraries when needed and also to avoid re-linking or other RPATH editing on installation. We can use a simpler approach to satisfy both goals: always use RPATH entries for libraries found externally. If there are no such libraries we will get no RPATH. If there are such libraries that are not in standard paths we will get a RPATH that points at them. This will work for running either from the build tree or the install tree, so we can use the same for both to avoid editing on installation. Fixes: #20185
* | | | | | | | | | | Merge topic 'avoid-getcwd'Brad King2020-01-155-5/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 22f38c0d6b cmake: avoid getcwd in `CollapseFullPath` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4218
| * | | | | | | | | | | cmake: avoid getcwd in `CollapseFullPath`Tim Blechmann2020-01-145-5/+10
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `CollapseFullPath` calls getcwd, which is a rather expensive system call. we can replace it with `GetHomeOutputDirectory()` to save us from the calling overhead