summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fileApiAddPrecompileHeadersBacktrace'Brad King2020-05-2514-8/+712
|\ | | | | | | | | | | | | | | | | | | 9f6d40ee23 fileapi: Extend codemodel targets with PRECOMPILE_HEADERS b698764a31 Tests: Add a PCH example to RunCMake.FileAPI codemodel-v2 b3812c0e54 Tests: Fix indentation in RunCMake.FileAPI cxx_exe.json 9c48804b69 PCH: Fix source group of per-architecture PCH headers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4684
| * fileapi: Extend codemodel targets with PRECOMPILE_HEADERSJustin Goshi2020-05-229-3/+218
| |
| * Tests: Add a PCH example to RunCMake.FileAPI codemodel-v2Justin Goshi2020-05-228-2/+491
| |
| * Tests: Fix indentation in RunCMake.FileAPI cxx_exe.jsonBrad King2020-05-221-2/+2
| |
| * PCH: Fix source group of per-architecture PCH headersBrad King2020-05-221-1/+1
| | | | | | | | | | | | | | In commit f593b354da (PCH: Add support for multi architecture iOS projects, 2020-04-02) we forgot to update our regex that assigns PCH headers to the `Precompile Header File` source group to account for the `_<arch>` suffix that can now appear on their name.
* | Merge topic 'FindSquish_settingsgroup_removal'Brad King2020-05-254-16/+10
|\ \ | | | | | | | | | | | | | | | | | | 8492ac1363 FindSquish: Remove settingsGroup argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4763
| * | FindSquish: Remove settingsGroup argumentFrederik Gladhorn2020-05-194-16/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This argument never worked and was not passed on Windows, which is why the Windows version needs fewer fixups (and used to work independent of this change). On Linux (and macOS) it was passed and prevented the server from starting and the test would not be able to run. See also comments on https://gitlab.kitware.com/cmake/cmake/-/merge_requests/4648
* | | Merge topic 'curl-send-recv'Brad King2020-05-251-0/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0a46eb11af curl: Avoid checking 'send' and 'recv' signatures Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4767
| * | | curl: Avoid checking 'send' and 'recv' signaturesBrad King2020-05-201-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cURL detects the `send` and `recv` signatures using a large loop of `try_compile` checks. The results are used for the following: * Casting argument types in calls to `send` and `recv`, perhaps to avoid conversion warnings. We compile with `-w` anyway. * Providing debug variants for `CURLDEBUG`, which we do not use. Replace the detection loops with hard-coded results that should work well enough everywhere. This significantly reduces the number of configure-time checks for building CMake on some platforms.
* | | | Merge topic 'cuda-runtime-cleanup'Brad King2020-05-258-89/+72
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bcb44ac2ee CUDA: Simplify Clang implicit host linker settings 23519dd24f CUDA: Fix implicit runtime library filtering on Windows 16bed00712 CUDA: Refactor implicit library filtering 5c7ca6f8a8 CUDA: Move VS CudaRuntime selection to be with rest of CUDA options 4468acb979 CUDA: Factor runtime library lookup into helper method Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4776
| * | | | CUDA: Simplify Clang implicit host linker settingsBrad King2020-05-221-14/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose of `CMAKE_CUDA_HOST_IMPLICIT_LINK_*` is to capture the extra link libraries and directories that the CUDA compiler passes when invoking the host linker. We need this when using NVCC because CMake drives the host linker directly rather than through NVCC. However, this is not needed with Clang because: * Clang does not pass any CUDA libraries automatically. * We drive linking with the Clang compiler anyway. Drop the detection logic for Clang because it only gives the normal C++ runtime libraries which we do not need here.
| * | | | CUDA: Fix implicit runtime library filtering on WindowsBrad King2020-05-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | The CUDA runtime library names may have a `.lib` suffix. Exclude those too.
| * | | | CUDA: Refactor implicit library filteringBrad King2020-05-222-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter CMAKE_CUDA_HOST_IMPLICIT_LINK_LIBRARIES just after it is computed. Re-use the same exclusion list for filtering CMAKE_CUDA_IMPLICIT_LINK_LIBRARIES to avoid duplication.
| * | | | CUDA: Move VS CudaRuntime selection to be with rest of CUDA optionsBrad King2020-05-223-26/+11
| | | | |
| * | | | CUDA: Factor runtime library lookup into helper methodBrad King2020-05-224-42/+42
| | | | |
* | | | | Merge branch 'release-3.17'Brad King2020-05-250-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'ninja-multi-install' into release-3.17Brad King2020-05-256-6/+117
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dddb4f02f7 Ninja Multi-Config: Make "install" targets depend on default configs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4778
* | \ \ \ \ \ Merge topic 'ninja-multi-install'Brad King2020-05-256-6/+117
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dddb4f02f7 Ninja Multi-Config: Make "install" targets depend on default configs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4778
| * | | | | | Ninja Multi-Config: Make "install" targets depend on default configsKyle Edwards2020-05-226-6/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And add an "install:all" target. Fixes: #20713
* | | | | | | CMake Nightly Date StampKitware Robot2020-05-251-1/+1
| | | | | | |
* | | | | | | Merge topic 'doc-init-and-env-var-priority'Craig Scott2020-05-248-1/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00c0c27303 Help: Clarify how env vars and ..._INIT variables interact Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4782
| * | | | | | | Help: Clarify how env vars and ..._INIT variables interactCraig Scott2020-05-248-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20358
* | | | | | | | CMake Nightly Date StampKitware Robot2020-05-241-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'doc-contributing-forum'Craig Scott2020-05-231-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4f7cdcaabf Help: Update contributor instructions to refer to the forum Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4785
| * | | | | | | | Help: Update contributor instructions to refer to the forumCraig Scott2020-05-231-2/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | Fixes: #20746
* | | | | | | | CMake Nightly Date StampKitware Robot2020-05-231-1/+1
|/ / / / / / /
* | | | | | | 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
generated by cgit v0.12 at 2025-08-26 08:56:41 (GMT)