summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Help: Clarify how env vars and ..._INIT variables interactCraig Scott2020-05-248-1/+19
| | | Fixes: #20358
* Merge topic 'fortran-preprocess-property'Brad King2020-05-2238-131/+479
|\ | | | | | | | | | | | | | | | | | | 3888de23da Ninja: Skip Fortran preprocessing if Fortran_PREPROCESS is OFF 66c4e87282 Ninja: Add helper functions to generate Fortran build 5cca1ec893 Ninja: Add helper functions to generate Fortran preprocess rule b0a6161190 Fortran: Add Fortran_PREPROCESS property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4659
| * Ninja: Skip Fortran preprocessing if Fortran_PREPROCESS is OFFPeter Hill2020-05-215-34/+88
| | | | | | | | | | | | | | | | | | If `Fortran_PREPROCESS` is explicitly turned off for a source file then we know it does not need to be preprocessed. Teach the Ninja generator to skip preprocessing in this case. Otherwise we still must preprocess just in case. Fixes: #18870
| * Ninja: Add helper functions to generate Fortran buildPeter Hill2020-05-211-61/+87
| |
| * Ninja: Add helper functions to generate Fortran preprocess rulePeter Hill2020-05-211-69/+98
| |
| * Fortran: Add Fortran_PREPROCESS propertyPeter Hill2020-05-2137-4/+243
| | | | | | | | Issue: #18870
* | Merge topic 'cmake_language-rename-from-cmake_command'Craig Scott2020-05-2292-128/+127
|\ \ | | | | | | | | | | | | | | | | | | 94c1e4fdb3 cmake_language: Rename command from cmake_command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4774
| * | cmake_language: Rename command from cmake_commandBrad King2020-05-2192-128/+127
| | | | | | | | | | | | | | | | | | Also rename the `INVOKE` signature to `CALL`. Fixes: #20732
* | | Merge topic 'autogen-fix-workerpool-locking'Brad King2020-05-221-28/+41
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 01ad902588 Autogen: Redo locking and state machine for fence handling and the worker pool Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4775
| * | | Autogen: Redo locking and state machine for fence handling and the worker poolJoerg Sonnenberger2020-05-211-28/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (1) All CV use must hold the corresponding mutex, otherwise race conditions happen. This is mandated by the C++ standard. (2) Introduce a separate CV for the thread waiting for other jobs to finish before running a fence. This avoids waking up all other workers blindly. Correctly wake that thread up when the processing of outstanding jobs is done. (3) Split the waiting for a fence to become runnable from a fence is pending. This avoids problems if more than one fence can end up on the queue. The thread that took a fence off the queue is responsible for clearing the fence processing flag.
* | | | Merge topic 'support_conda_env'Brad King2020-05-225-1/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 50879ce412 Conda: Add CONDA_PREFIX as an acceptable system prefix path cd9c3c000f Tests: Update QtAutogen codeeditor test only include headers needed d806bd2e8c Tests: Update test suite to run in an Anaconda environment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4773
| * | | | Conda: Add CONDA_PREFIX as an acceptable system prefix pathRobert Maynard2020-05-212-0/+7
| | | | |
| * | | | Tests: Update QtAutogen codeeditor test only include headers neededRobert Maynard2020-05-211-1/+4
| | | | |
| * | | | Tests: Update test suite to run in an Anaconda environmentRobert Maynard2020-05-212-0/+15
| | | | |
* | | | | Merge branch 'release-3.17'Brad King2020-05-220-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'cuda-default-runtime' into release-3.17Brad King2020-05-2212-7/+65
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e55b21e24e CUDA: Compute CMAKE_CUDA_RUNTIME_LIBRARY default from toolchain 1086e930dc CUDA: Propagate CMAKE_CUDA_RUNTIME_LIBRARY state to try_compile a4ea293153 Help: Correct CMAKE_CUDA_RUNTIME_LIBRARY applicability Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4762
* | \ \ \ \ \ Merge topic 'cuda-default-runtime'Brad King2020-05-2212-7/+66
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8eee80e30 Merge branch 'backport-cuda-default-runtime' into cuda-default-runtime e55b21e24e CUDA: Compute CMAKE_CUDA_RUNTIME_LIBRARY default from toolchain 1086e930dc CUDA: Propagate CMAKE_CUDA_RUNTIME_LIBRARY state to try_compile a4ea293153 Help: Correct CMAKE_CUDA_RUNTIME_LIBRARY applicability Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4762
| * \ \ \ \ \ \ Merge branch 'backport-cuda-default-runtime' into cuda-default-runtimeBrad King2020-05-2212-7/+66
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | CUDA: Compute CMAKE_CUDA_RUNTIME_LIBRARY default from toolchainRobert Maynard2020-05-2110-6/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 0d0145138f (CUDA: Add abstraction for cuda runtime selection, 2019-11-29, v3.17.0-rc1~83^2) we add CUDA runtime library selection flags by default. To maintain backwards compatibility the default CUDA runtime library needs to be computed based on what libraries are found on the initial compiler invocation. For example a toolchain could establish initial flags that have all CUDA compilations using the runtime version, and if we don't detect this we will try to link to both the static and shared runtime. Co-Author: Brad King <brad.king@kitware.com> Fixes: #20708
| | * | | | | | CUDA: Propagate CMAKE_CUDA_RUNTIME_LIBRARY state to try_compileRobert Maynard2020-05-202-0/+4
| | | | | | | |
| | * | | | | | Help: Correct CMAKE_CUDA_RUNTIME_LIBRARY applicabilityRobert Maynard2020-05-201-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-05-221-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge topic 'multi-ninja-pch-msvc'Brad King2020-05-216-12/+35
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6cb1e646c Multi-Ninja: Fix PCHs for Visual C++ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4771
| * | | | | | Multi-Ninja: Fix PCHs for Visual C++Cristian Adam2020-05-206-12/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20711
* | | | | | | Merge topic 'cmake_command_invoke_expand_function_name'Brad King2020-05-2122-21/+108
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa55587094 cmake_command: Expand INVOKE function name argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4750
| * | | | | | | cmake_command: Expand INVOKE function name argumentCristian Adam2020-05-1922-21/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20707
* | | | | | | | Merge branch 'release-3.17'Brad King2020-05-210-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge topic 'FindPython-debug-library-lookup' into release-3.17Brad King2020-05-211-2/+8
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71e6854b22 FindPython: use CMAKE specific variables to look-up debug library Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4764
* | | | | | | | Merge topic 'FindPython-debug-library-lookup'Brad King2020-05-211-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 596db17cdd Merge branch 'backport-3.17-FindPython-debug-library-lookup' into FindPython-debug-library-lookup e7b9f928f7 FindPython: use CMAKE specific variables to look-up debug library 71e6854b22 FindPython: use CMAKE specific variables to look-up debug library Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4764
| * \ \ \ \ \ \ \ Merge branch 'backport-3.17-FindPython-debug-library-lookup' into ↵Marc Chevrier2020-05-180-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | FindPython-debug-library-lookup
| | * | | | | | | FindPython: use CMAKE specific variables to look-up debug libraryMarc Chevrier2020-05-181-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20714
| * | | | | | | | FindPython: use CMAKE specific variables to look-up debug libraryMarc Chevrier2020-05-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20714
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-05-211-1/+1
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge topic 'cuda-test-nvcc-restore'Brad King2020-05-205-5/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c7cc264af Tests: Restore NVCC-specific CUDA tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4768
| * | | | | | | Tests: Restore NVCC-specific CUDA testsBrad King2020-05-205-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit a653ca9504 (Tests: Update CUDA tests to work with Clang, 2020-03-27) some tests were conditioned using `CMAKE_CUDA_COMPILER_ID`. That is not defined when configuring CMake itself, so it accidentally turned off NVCC-specific CUDA tests altogether. Convert the conditions to check `CMake_TEST_CUDA` for `Clang` instead. That option is added explicitly to builds where we want the tests to run, so we can set it to a value indicating the CUDA compiler vendor. In commit a653ca9504 (Tests: Update CUDA tests to work with Clang, 2020-03-27) the NVCC-specific `CudaOnly.GPUDebugFlag` test was accidentally broken by removing a space when appending `-G` to the CUDA flags. This was covered by the test not running. Restore the space. Fixes: #20727
* | | | | | | | Merge topic 'doc-find_package-xref'Brad King2020-05-201-6/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bc735062df Help: Improve formatting and cross-references for find_package() Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !4772
| * | | | | | | | Help: Improve formatting and cross-references for find_package()Craig Scott2020-05-201-6/+6
| | | | | | | | |
* | | | | | | | | Merge topic 'ccmake-check-width'Brad King2020-05-201-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3aede31cfc ccmake: Check that getmaxyx result width is non-negative Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4770
| * | | | | | | | | ccmake: Check that getmaxyx result width is non-negativeBrad King2020-05-191-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise GCC 10.1 issues a `-Wstringop-overflow=` diagnostic when we use the width for indexing.
* | | | | | | | | Merge topic 'ctest-log-environment'Brad King2020-05-2010-3/+88
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1612af749 CTest: Log environment variables as a test measurement Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4760
| * | | | | | | | | CTest: Log environment variables as a test measurementKyle Edwards2020-05-1910-3/+88
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'update-kwsys'Brad King2020-05-206-14/+91
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef215b0851 cmFileCommand: Log cmsys::Glob warnings ef4d992b54 Merge branch 'upstream-KWSys' into update-kwsys 8fd4c19e1b KWSys 2020-05-18 (146f6b36) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4758
| * | | | | | | | | cmFileCommand: Log cmsys::Glob warningsDmitry Kalinkin2020-05-191-4/+9
| | | | | | | | | |
| * | | | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-05-185-10/+82
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-05-18 (146f6b36)
| | * | | | | | | | | KWSys 2020-05-18 (146f6b36)KWSys Upstream2020-05-185-10/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 146f6b36442dec7a3315f5bfc4e3d71ffa943e53 (master). Upstream Shortlog ----------------- Brad King (2): e093a985 Glob: Append warning message only if destination is non-null 25775078 Glob: Do not warn if top-level directory does not exist Dmitry Kalinkin (3): 9a3f9799 Directory: implement error reporting f33ef4e3 Glob: issue warnings on Directory errors 97f880e6 Directory: add extra tests involving errorMessage
* | | | | | | | | | | Merge topic 'export-cmake-policy-version-range'Brad King2020-05-201-4/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca24b70d31 Export: Specify a policy range in exported files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4755
| * | | | | | | | | | | Export: Specify a policy range in exported filesCraig Scott2020-05-181-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should reduce policy-related warnings coming from the generated files, but in a way that doesn't increase the minimum CMake version for consumers. Relates: #20561
* | | | | | | | | | | | Merge branch 'release-3.16'Brad King2020-05-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vs-sln-version' into release-3.16Brad King2020-05-191-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4765
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-3.17'Brad King2020-05-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
generated by cgit v0.12 at 2025-02-07 07:23:44 (GMT)