summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'grd-win-objdump-newline'Brad King2021-06-081-2/+3
|\ | | | | | | | | | | | | | | 100d3cb392 file(GET_RUNTIME_DEPENDENCIES): Use cmSystemTools::GetLineFromStream() Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !6198
| * file(GET_RUNTIME_DEPENDENCIES): Use cmSystemTools::GetLineFromStream()Kyle Edwards2021-06-071-2/+3
| | | | | | | | Fixes: #22278
* | Merge topic 'openssl-static'Brad King2021-06-081-0/+4
|\ \ | | | | | | | | | | | | | | | | | | 98fa09d5be FindOpenSSL: Link with ws2_32 and crypt32 on Windows/static Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6197
| * | FindOpenSSL: Link with ws2_32 and crypt32 on Windows/staticOrgad Shaneh2021-06-071-0/+4
| | |
* | | Merge topic 'compile-options-order'Brad King2021-06-0815-19/+132
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8f68bcad8f Tests: Add cases verifying flag ordering rules ccc83ce162 Help: Document order of flags from CMAKE_<LANG>_FLAGS and COMPILE_OPTIONS df79fe055b Help: Remove incorrect "versionadded" for CMAKE_<LANG>_FLAGS_<CONFIG> c48d2d8480 VS: Place per-source preprocessor definitions after target-wide ones Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6187
| * | | Tests: Add cases verifying flag ordering rulesBrad King2021-06-078-3/+95
| | | |
| * | | Help: Document order of flags from CMAKE_<LANG>_FLAGS and COMPILE_OPTIONSBrad King2021-06-035-8/+26
| | | |
| * | | Help: Remove incorrect "versionadded" for CMAKE_<LANG>_FLAGS_<CONFIG>Brad King2021-06-031-2/+0
| | | | | | | | | | | | | | | | | | | | These variables have been around for a long time, but the current form of the document was added later.
| * | | VS: Place per-source preprocessor definitions after target-wide onesBrad King2021-06-032-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the VS 2010+ generators were first implemented in commit 7491f52992 (ENH: first pass at VS 10, can bootstrap CMake, but many tests still fail, 2009-06-25, v2.8.0~546), the per-source preprocessor definitions were placed before target-wide preprocessor definitions for consistency with the behavior of VS 9 2008 and below. However, those generators are not used much anymore. Instead prefer consistency with the order used by the Ninja and Makefile generators.
* | | | Merge topic 'cpack-deb-minor-fixes'Brad King2021-06-082-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed1f3a5fa5 CPackDeb: output the error message when no description can be made ece24b343a Help/cpack_gen/freebsd: improve wording for Debian fallbacks Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !6196
| * | | | CPackDeb: output the error message when no description can be madeBen Boeckel2021-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | The `message` command does not support automatic dereferencing.
| * | | | Help/cpack_gen/freebsd: improve wording for Debian fallbacksBen Boeckel2021-06-071-2/+2
| | |/ / | |/| | | | | | | | | | | | | | Documentation should describe what happens, and "we may as well" seems way too conversational.
* | | | Merge topic 'FindPkgConfigAlwaysAddTarget'Brad King2021-06-084-3/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6f14205e08 FindPkgConfig: Always create the imported target 07d6390728 Tests: Add case covering FindPkgConfig creation of empty targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6113
| * | | | FindPkgConfig: Always create the imported targetAdam Badura2021-06-042-3/+5
| | | | | | | | | | | | | | | | | | | | Fixes: #22180
| * | | | Tests: Add case covering FindPkgConfig creation of empty targetsBrad King2021-06-043-0/+19
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2021-06-081-1/+1
| | | | |
* | | | | Merge topic 'doc-CMAKE_CFG_INTDIR'Craig Scott2021-06-072-14/+14
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41dea08423 Help: Remove recommendations for using CMAKE_CFG_INTDIR Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Brad King <brad.king@kitware.com> Merge-request: !6195
| * | | | Help: Remove recommendations for using CMAKE_CFG_INTDIRCraig Scott2021-06-062-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit e71c4f7729 (CMAKE_CFG_INTDIR: Formally deprecate in favor of $<CONFIG>, 2021-05-27) only updated the docs for CMAKE_CFG_INTDIR itself, but other parts of the docs still used it. Update the other places to avoid referring to the now-deprecated variable.
* | | | | Merge topic 'vs-flag-tables'Brad King2021-06-072-28/+263
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 887e9df0c7 VS: Update v142 CL flag table for VS 16.10 25e33a282b VS: Update v141 CL flag table for VS 15.9 f9383e0140 VS: Re-order v141 and v142 CL flag table entries to match xml files better Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6191
| * | | | | VS: Update v142 CL flag table for VS 16.10Brad King2021-06-041-5/+219
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run the command python3 Source/cmConvertMSBuildXMLToJSON.py -t v142 \ 'c:/.../MSBuild/Microsoft/VC/v160/1033/cl.xml' To generate `v142_CL.json` locally. Manually move new and updated settings over to `Templates/MSBuild/FlagTables/v142_CL.json`. Revise the `/sourceDependencies[:directives]` table entries to properly distinguish the two options (because one is a prefix of the other), and to populate both `Generate*Dependencies` and `*DependenciesFile`.
| * | | | | VS: Update v141 CL flag table for VS 15.9Brad King2021-06-041-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run the command python3 Source/cmConvertMSBuildXMLToJSON.py -t v141 \ 'c:/.../Common7/IDE/VC/VCTargets/1033/cl.xml' To generate `v141_CL.json` locally. Manually move new and updated settings over to `Templates/MSBuild/FlagTables/v141_CL.json`.
| * | | | | VS: Re-order v141 and v142 CL flag table entries to match xml files betterBrad King2021-06-042-28/+28
| | |_|_|/ | |/| | |
* | | | | Merge branch 'release-3.20'Brad King2021-06-070-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'FindBoost-json-header' into release-3.20Brad King2021-06-071-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c44dfdfdbb FindBoost: Add check for json component header in Boost 1.75+ Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6193
* | \ \ \ \ \ Merge topic 'FindBoost-json-header'Brad King2021-06-071-0/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c44dfdfdbb FindBoost: Add check for json component header in Boost 1.75+ Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6193
| * | | | | | FindBoost: Add check for json component header in Boost 1.75+John Drouhard2021-06-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 8293064760 (FindBoost: Add support for Boost 1.75, 2021-02-03, v3.19.5~9^2) the dependencies of the json component were added, but the header listing was left out.
* | | | | | | Merge topic 'ci-clang'Brad King2021-06-074-0/+22
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e5e558d0f gitlab-ci: add job to test with clang-7 on debian10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6194
| * | | | | | gitlab-ci: add job to test with clang-7 on debian10Brad King2021-06-044-0/+22
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Test with a Clang version old enough to have caught the regression fixed by commit 9411766c35 (BinUtils: Avoid llvm-objdump versions older than Clang 9, 2021-05-29).
* | | | | | CMake Nightly Date StampKitware Robot2021-06-071-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2021-06-061-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2021-06-051-1/+1
|/ / / /
* | | | Merge topic 'env-toolchain-file'Brad King2021-06-0417-0/+86
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c34ed9b87 cmake: Allow CMAKE_TOOLCHAIN_FILE to be set by environment variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6188
| * | | | cmake: Allow CMAKE_TOOLCHAIN_FILE to be set by environment variableBrad King2021-06-0317-0/+86
| | |_|/ | |/| | | | | | | | | | | | | | When no `CMAKE_TOOLCHAIN_FILE` is explicitly specified while creating a new build tree, check for an environment variable of the same name.
* | | | Merge topic 'implicit-link-static'Brad King2021-06-0443-37/+322
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1d7fddca8e CMakeParseImplicitLinkInfo: Honor GNU static runtime library flags 629eb3926b Tests: Extend ParseImplicit*Info with static GNU runtime library flags 9d0f8c3e56 Tests: Teach RunCMake.ParseImplicitLinkInfo to match output by regex Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6185
| * | | | CMakeParseImplicitLinkInfo: Honor GNU static runtime library flagsBrad King2021-06-037-3/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With flags like `-static-libstdc++` or `-static-libgfortran`, the GNU compiler driver adds `-Bstatic ... -Bdynamic` around its language runtime library. Convert the libraries in between these to absolute paths so that mixed-language linking honors the static runtime libraries.
| * | | | Tests: Extend ParseImplicit*Info with static GNU runtime library flagsBrad King2021-06-0312-1/+249
| | | | | | | | | | | | | | | | | | | | | | | | | Generate sample input data with GNU 10.2.1 compilers using flags like `-static-libstdc++` and `-static-libgfortran`.
| * | | | Tests: Teach RunCMake.ParseImplicitLinkInfo to match output by regexBrad King2021-06-0330-35/+35
| |/ / / | | | | | | | | | | | | | | | | As in commit 6bc6fc2a7f (Tests: Teach RunCMake.ParseImplicitIncludeInfo to match output by regex, 2019-04-08, v3.14.2~5^2~1).
* | | | Merge topic 'ci-clang-analyzer'Brad King2021-06-0425-2917/+2467
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da14f4e19e gitlab-ci: add job to build with clang-analyzer adc38da49f ci: add clang-analyzer to Fedora base image b6c4d93dcd clang-analyzer: Suppress warnings in intentional use-after-move cases c1b575f4d1 clang-analyzer: rename from scan-build in comments dbfb50cd72 cmFileAPICodemodel: Assert input in DirectoryObject::DumpInstaller 410bf8ed4f cmStandardLevelResolver: Fix size assertion in constructor 82584b99e3 jsoncpp: Revert "Code style: add missed explicit 'this->'" Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6189
| * | | | gitlab-ci: add job to build with clang-analyzerBrad King2021-06-035-18/+32
| | | | | | | | | | | | | | | | | | | | | | | | | Update the exceptions in `CTestCustom.cmake.in` to match this job's needs. Drop exceptions needed only by our previous nightly build.
| * | | | ci: add clang-analyzer to Fedora base imageBrad King2021-06-032-1/+2
| | | | |
| * | | | clang-analyzer: Suppress warnings in intentional use-after-move casesBrad King2021-06-032-0/+6
| | | | |
| * | | | clang-analyzer: rename from scan-build in commentsBrad King2021-06-0314-14/+14
| | | | |
| * | | | cmFileAPICodemodel: Assert input in DirectoryObject::DumpInstallerBrad King2021-06-031-0/+1
| | | | | | | | | | | | | | | | | | | | This tells clang-analyzer that the `gen` argument is never `nullptr`.
| * | | | cmStandardLevelResolver: Fix size assertion in constructorBrad King2021-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | Assert sizes of the constructed vectors, not the moved-from inputs.
| * | | | jsoncpp: Revert "Code style: add missed explicit 'this->'"Kitware Robot2021-06-033-2883/+2411
| |/ / / | | | | | | | | | | | | | | | | Revert the part of commit 209daa20b2 (Code style: add missed explicit 'this->', 2021-01-05, v3.20.0-rc1~213^2) that updated third-party code.
* | | | Merge branch 'release-3.20'Brad King2021-06-040-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge topic 'ci-sccache-consistent-builds' into release-3.20Brad King2021-06-041-33/+18
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9d7ebb47ea ci: use consistent sccache builds Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6156
* | \ \ \ Merge topic 'ci-sccache-consistent-builds'Brad King2021-06-041-33/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95faf9cb96 Merge branch 'master' into ci-sccache-consistent-builds 9d7ebb47ea ci: use consistent sccache builds Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6156
| * \ \ \ \ Merge branch 'master' into ci-sccache-consistent-buildsBrad King2021-06-031424-10453/+28901
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| |
| * | | | ci: use consistent sccache buildsBen Boeckel2021-06-021-33/+18
| | | | |