summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.25'Brad King2022-11-020-0/+0
|\
| * Merge topic 'IAR-CXX-fix' into release-3.25Brad King2022-11-021-2/+2
| |\ | | | | | | | | | | | | | | | | | | 73e84a392b IAR: Restore support for CMAKE_CXX_FLAGS_INIT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7857
* | \ Merge topic 'IAR-CXX-fix'Brad King2022-11-021-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 73e84a392b IAR: Restore support for CMAKE_CXX_FLAGS_INIT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7857
| * | IAR: Restore support for CMAKE_CXX_FLAGS_INITDaniel Schürmann2022-11-011-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | Prior to commit a9073db736 (IAR: update language specification detection, 2021-09-23, v3.22.0-rc1~83^2) the `--c++`/`--eec++` flags were stored in `CMAKE_IAR_CXX_FLAG` so that they would be used as part of the `CMAKE_CXX_COMPILE_OBJECT` rule variable. That commit moved the flags to `CMAKE_CXX_FLAGS`, which also broke initialization of `CMAKE_CXX_FLAGS` from `CMAKE_CXX_FLAGS_INIT`. Restore the original approach. Fixes: #24111
* | CMake Nightly Date StampKitware Robot2022-11-021-1/+1
| |
* | Merge branch 'release-3.25'Brad King2022-11-010-0/+0
|\ \ | |/
| * CMake 3.25.0-rc3v3.25.0-rc3Brad King2022-11-011-1/+1
| |
* | Merge branch 'release-3.25'Brad King2022-11-010-0/+0
|\ \ | |/
| * Merge branch 'release-3.24' into release-3.25Brad King2022-11-011-0/+11
| |\
* | \ Merge branch 'release-3.24'Brad King2022-11-011-0/+11
|\ \ \ | | |/ | |/|
| * | CMake 3.24.3v3.24.3Brad King2022-11-012-1/+12
| | |
* | | Merge branch 'release-3.25'Brad King2022-11-010-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'release-3.24' into release-3.25Brad King2022-11-011-2/+2
| |\ \ | | |/
* | | Merge branch 'release-3.24'Brad King2022-11-010-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'release-3.23' into release-3.24Brad King2022-11-011-2/+2
| |\ \
* | \ \ Merge branch 'release-3.23'Brad King2022-11-011-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | CMake 3.23.5v3.23.5Brad King2022-11-012-3/+3
| | | |
* | | | Merge topic 'compile-commands-output-field'Brad King2022-11-018-10/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 887a8874c3 EXPORT_COMPILE_COMMANDS: add `output` field Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7844
| * | | | EXPORT_COMPILE_COMMANDS: add `output` fieldBen Boeckel2022-10-288-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also write for all configurations from multi-config generators. This field was added in the Clang 5 documentation and not present in the Clang 4 documentation (sometime between Dec 2016 and Mar 2017 according to `web.archive.org`).
* | | | | Merge topic 'test-objc'Brad King2022-11-014-68/+57
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb2370842f Tests: Simplify RunCMake.try_compile compiler inspection 1abcb094a7 Tests: Fix logic to enable RunCMake.try_compile OBJC/OBJCXX cases b641a80d55 Tests: Factor out a CMake_TEST_OBJC variable for OBJC/OBJCXX test conditions Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7855
| * | | | | Tests: Simplify RunCMake.try_compile compiler inspectionBrad King2022-10-313-48/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect the compiler id, version, and default standard level in the test's inspection step rather than passing it all in from the host CMake build's results. This avoids repeating details not known to older versions of CMake, and shortens the code.
| * | | | | Tests: Fix logic to enable RunCMake.try_compile OBJC/OBJCXX casesBrad King2022-10-313-11/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake itself does not enable the OBJC/OBJCXX languages, so the `CMAKE_OBJ{C,CXX}_STANDARD_DEFAULT` variables are never defined. Detect them inside the test instead.
| * | | | | Tests: Factor out a CMake_TEST_OBJC variable for OBJC/OBJCXX test conditionsBrad King2022-10-312-9/+17
| | | | | |
* | | | | | Merge topic 'test-eol'Brad King2022-11-012-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4180159758 Tests: Provide RunCMake.CommandLine compare_files data more robustly Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7852
| * | | | | | Tests: Provide RunCMake.CommandLine compare_files data more robustlyBrad King2022-10-312-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `lf` and `crlf` files need to have exact LF and CRLF newlines, respectively. Previously we used the Git `eol` attribute for this, but occasionally the Git work tree ends up without the conversion. It is unclear why that happens, so try to avoid the problem by treating their content as binary instead.
* | | | | | Merge topic 'lcc-cleanup'Brad King2022-11-011-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a2943d9ec8 Tests: Teach CheckSourceTree test to clean up more specific known files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7850
| * | | | | | Tests: Teach CheckSourceTree test to clean up more specific known filesBrad King2022-10-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the list of files added by commit 2de1458c3c (Tests: Teach CheckSourceTree test to clean up some specific known files, 2022-10-13).
* | | | | | | Merge topic 'update-nghttp2'Brad King2022-11-0128-695/+3252
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e44b551e8d nghttp2: Update build within CMake to account for 1.50.0 8b73605408 Merge branch 'upstream-nghttp2' into update-nghttp2 7ce2a682a3 nghttp2 2022-09-21 (87fef4ab) 66c9536775 nghttp2: Update script to get nghttp2 1.50.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7856
| * | | | | | | nghttp2: Update build within CMake to account for 1.50.0Brad King2022-10-311-0/+1
| | | | | | | |
| * | | | | | | Merge branch 'upstream-nghttp2' into update-nghttp2Brad King2022-10-3126-694/+3250
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By nghttp2 upstream * upstream-nghttp2: nghttp2 2022-09-21 (87fef4ab)
| | * | | | | | | nghttp2 2022-09-21 (87fef4ab)nghttp2 upstream2022-10-3126-694/+3250
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/nghttp2/nghttp2.git at commit 87fef4ab71bebb2168f8d3d554df8d2f0f01f497 (v1.50.0).
| * | | | | | | | nghttp2: Update script to get nghttp2 1.50.0Brad King2022-10-311-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'release-3.25'Brad King2022-11-010-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge topic 'update-curl' into release-3.25Brad King2022-11-01350-4296/+8265
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25e9f31878 curl: Set build options the way we need for CMake 9ffe6b0969 Merge branch 'upstream-curl' into update-curl ec122fff08 curl 2022-10-26 (cd95ee9f) fa9bbb8627 curl: Update script to get curl 7.86.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7851
* | \ \ \ \ \ \ \ Merge topic 'update-curl'Brad King2022-11-01350-4296/+8265
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25e9f31878 curl: Set build options the way we need for CMake 9ffe6b0969 Merge branch 'upstream-curl' into update-curl ec122fff08 curl 2022-10-26 (cd95ee9f) fa9bbb8627 curl: Update script to get curl 7.86.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7851
| * | | | | | | | curl: Set build options the way we need for CMakeBrad King2022-10-312-0/+18
| | | | | | | | |
| * | | | | | | | Merge branch 'upstream-curl' into update-curlBrad King2022-10-31348-4295/+8246
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2022-10-26 (cd95ee9f)
| | * | | | | | | | curl 2022-10-26 (cd95ee9f)Curl Upstream2022-10-31348-4285/+8247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit cd95ee9f771361acf241629d2fe5507e308082a2 (curl-7_86_0).
| * | | | | | | | | curl: Update script to get curl 7.86.0Brad King2022-10-311-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'release-3.25'Brad King2022-11-010-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'cmp0141-pch-reuse' into release-3.25Brad King2022-11-0118-54/+72
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 183b9a9eca CMP0141: Fix PCH REUSE_FROM under policy NEW behavior 4d13f472a2 Tests: Drop redundant project init from RunCMake.PrecompileHeaders cases 2e65fe92db cmLocalGenerator: Clarify name of local PDB type variable 17096aeba8 cmLocalGenerator: Factor out helper to compute MSVC_DEBUG_INFORMATION_FORMAT Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7854
* | \ \ \ \ \ \ \ \ \ Merge topic 'cmp0141-pch-reuse'Brad King2022-11-0118-54/+72
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 183b9a9eca CMP0141: Fix PCH REUSE_FROM under policy NEW behavior 4d13f472a2 Tests: Drop redundant project init from RunCMake.PrecompileHeaders cases 2e65fe92db cmLocalGenerator: Clarify name of local PDB type variable 17096aeba8 cmLocalGenerator: Factor out helper to compute MSVC_DEBUG_INFORMATION_FORMAT Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7854
| * | | | | | | | | | CMP0141: Fix PCH REUSE_FROM under policy NEW behaviorBrad King2022-10-315-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under the CMP0141 NEW behavior added by commit 0e96a20478 (MSVC: Add abstraction for debug information format, 2022-08-25, v3.25.0-rc1~142^2~1), the `-Zi` and `-ZI` flags do not appear in `CMAKE_<LANG>_FLAGS_<CONFIG>` anymore. Teach the PCH REUSE_FROM implementation to recognize the `EditAndContinue` and `ProgramDatabase` debug information formats through the policy's new abstraction. Fixes: #24106
| * | | | | | | | | | Tests: Drop redundant project init from RunCMake.PrecompileHeaders casesBrad King2022-10-3113-29/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `CMakeLists.txt` file already calls `cmake_minimum_required` and `project` before including each case's code.
| * | | | | | | | | | cmLocalGenerator: Clarify name of local PDB type variableBrad King2022-10-311-3/+2
| | | | | | | | | | |
| * | | | | | | | | | cmLocalGenerator: Factor out helper to compute MSVC_DEBUG_INFORMATION_FORMATBrad King2022-10-312-16/+30
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'release-3.25'Brad King2022-11-010-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'FindCUDAToolkit-nvptxcompiler-static-deps' into release-3.25Brad King2022-11-011-1/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 301815eb62 FindCUDAToolkit: Add nvptxcompiler_static dependency on Threads::Threads Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7853
* | | | | | | | | | Merge topic 'FindCUDAToolkit-nvptxcompiler-static-deps'Brad King2022-11-011-1/+2
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 301815eb62 FindCUDAToolkit: Add nvptxcompiler_static dependency on Threads::Threads Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7853
| * | | | | | | | | FindCUDAToolkit: Add nvptxcompiler_static dependency on Threads::ThreadsRobert Maynard2022-10-311-1/+2
| |/ / / / / / / /