summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* AutoMoc: Configure AutoMoc after generated sources (PCH, Unity)Cristian Adam2020-05-262-5/+11
| | | | Fixes: #20119
* CMake Nightly Date StampKitware Robot2020-05-261-1/+1
|
* Merge topic 'fetchcontent-externalproject-empty-args'Craig Scott2020-05-2511-94/+235
|\ | | | | | | | | | | | | | | 8dca6bd04b FetchContent: Preserve empty string arguments cbf2daeed0 ExternalProject: Preserve empty string arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4729
| * FetchContent: Preserve empty string argumentsCraig Scott2020-05-235-21/+67
| | | | | | | | Fixes: #20579
| * ExternalProject: Preserve empty string argumentsCraig Scott2020-05-236-73/+168
| |
* | Merge branch 'release-3.17'Brad King2020-05-250-0/+0
|\ \
| * \ Merge topic 'doc-updates' into release-3.17Brad King2020-05-252-7/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | b3e4fb5144 Help: clarify add_definitions() and add_compile_definitions() behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4786
* | \ \ Merge topic 'doc-updates'Brad King2020-05-252-7/+9
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | b3e4fb5144 Help: clarify add_definitions() and add_compile_definitions() behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4786
| * | | Help: clarify add_definitions() and add_compile_definitions() behaviorMarc Chevrier2020-05-242-7/+9
| | | | | | | | | | | | | | | | Fixes: #20736
* | | | Merge topic 'gitlab-ci-regular-builders'Brad King2020-05-2522-64/+495
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b566f0b308 gitlab-ci: add windows builder 5b564c371e gitlab-ci: add Windows infrastructure 809f9a9916 gitlab: add powershell scripts for utilities 02c56b71a1 gitlab-ci: add a macos builder a1b1fc611b gitlab-ci: add Linux makefiles and ninja builders 3e1a1ba92d ci: add dependencies for the test suite to the Fedora image d5438f783a ci: add make to the CI image 0ed7e424ab gitlab-ci: use the cmake_build_unix anchor ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4723
| * | | | gitlab-ci: add windows builderBen Boeckel2020-05-222-0/+29
| | | | |
| * | | | gitlab-ci: add Windows infrastructureBen Boeckel2020-05-222-2/+81
| | | | |
| * | | | gitlab: add powershell scripts for utilitiesBen Boeckel2020-05-224-0/+66
| | | | |
| * | | | gitlab-ci: add a macos builderBen Boeckel2020-05-226-34/+164
| | | | |
| * | | | gitlab-ci: add Linux makefiles and ninja buildersBen Boeckel2020-05-226-1/+154
| | | | |
| * | | | ci: add dependencies for the test suite to the Fedora imageBen Boeckel2020-05-221-0/+5
| | | | |
| * | | | ci: add make to the CI imageBen Boeckel2020-05-221-1/+2
| | | | |
| * | | | gitlab-ci: use the cmake_build_unix anchorBen Boeckel2020-05-221-41/+3
| | | | |
| * | | | CTestCustom: ignore expat having symbol-less objects tooBen Boeckel2020-05-221-0/+1
| | | | |
| * | | | Tests/CPackWiXGenerator: support suppressing verificationBen Boeckel2020-05-222-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Verification requires access to an active Windows session which may not be the case in all testing environments.
| * | | | Tests/CPackWiXGenerator; support non-interactive sessionsBen Boeckel2020-05-221-0/+3
| | | | |
| * | | | Tests/RunCMake/export: handle collapsed newlinesBen Boeckel2020-05-221-2/+1
| | |_|/ | |/| | | | | | | | | | | | | | When the build path is long with a space near the line length, a newline is lost.
* | | | Merge topic 'CheckLinkerFlag-module'Brad King2020-05-2514-0/+145
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af96c0f4fa CheckLinkerFlag: Add module to check validity of linker flags 3c4cc77d55 Tests: Extend Fortran compiler information Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4777
| * | | | CheckLinkerFlag: Add module to check validity of linker flagsMarc Chevrier2020-05-2513-0/+142
| | | | | | | | | | | | | | | | | | | | Fixes: #15934
| * | | | Tests: Extend Fortran compiler informationMarc Chevrier2020-05-251-0/+3
| | | | | | | | | | | | | | | | | | | | Fill variable `CMake_Fortran_COMPILER_ID`.
* | | | | Merge topic 'ep-git-update-strategy'Brad King2020-05-254-174/+309
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0aea435aa1 ExternalProject: Provide choice of git update strategies ea410414c5 ExternalProject: factor out gitupdate step to separate file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4239
| * | | | | ExternalProject: Provide choice of git update strategiesCraig Scott2020-05-234-20/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16528 Co-Authored-By: Michael Wake <macwake@gmail.com>
| * | | | | ExternalProject: factor out gitupdate step to separate fileCraig Scott2020-05-232-163/+170
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The refactoring exposed that the original implementation was referring to an undefined variable src_name, which was previously only used in error messages. This has been fixed as part of the refactoring work. Fixes: #20336
* | | | | 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