summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Xcode: Properly identify frameworks with system includesGregor Jasny2021-12-226-1/+34
| | | | | | | | Check the complete include path for being a system include, not the derived framework search path. The code for Ninja and Makefile generators does exactly the same. Fixes: #23011
* CMake Nightly Date StampKitware Robot2021-12-221-1/+1
|
* Merge topic 'FindGLUT-include-dirs'Brad King2021-12-213-19/+55
|\ | | | | | | | | | | | | | | | | 6fda93faf8 FindGLUT: Provide modern-named GLUT_INCLUDE_DIRS result variable 641b3f4101 FindGLUT: Modernize documentation layout 924b2999a1 FindGLUT: Move mark_as_advanced calls closer to find calls Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6820
| * FindGLUT: Provide modern-named GLUT_INCLUDE_DIRS result variableBrad King2021-12-203-5/+32
| | | | | | | | | | | | | | Previously this module only provided `GLUT_INCLUDE_DIR`, which does not follow the modern naming convention documented in `cmake-developer(7)`. Issue: #23018
| * FindGLUT: Modernize documentation layoutBrad King2021-12-201-12/+20
| |
| * FindGLUT: Move mark_as_advanced calls closer to find callsBrad King2021-12-201-3/+4
| |
* | Merge branch 'release-3.22'Brad King2021-12-210-0/+0
|\ \
| * \ Merge topic 'FindBoost-1.78' into release-3.22Brad King2021-12-211-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | d45667d459 FindBoost: Do not warn about now-supported version 1.78 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6819
* | \ \ Merge topic 'FindBoost-1.78'Brad King2021-12-211-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | d45667d459 FindBoost: Do not warn about now-supported version 1.78 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6819
| * | | FindBoost: Do not warn about now-supported version 1.78Brad King2021-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit d176ff71c0 (FindBoost: Add support for Boost 1.78, 2021-12-15) we forgot to update the future-version check. Issue: #23016
* | | | CMake Nightly Date StampKitware Robot2021-12-211-1/+1
| |_|/ |/| |
* | | Merge topic 'doc-if-defined'Brad King2021-12-201-1/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a45e922768 Help: Clarify behavior of if(DEFINED) for cache and non-cache variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6817
| * | | Help: Clarify behavior of if(DEFINED) for cache and non-cache variablesCraig Scott2021-12-201-1/+10
| | | | | | | | | | | | Fixes: #23023
* | | | Merge topic 'doc-CMP0126-OLD'Brad King2021-12-201-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 47168b2231 Help: Clarify CMP0126 OLD behavior for FORCE and INTERNAL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6818
| * | | | Help: Clarify CMP0126 OLD behavior for FORCE and INTERNALCraig Scott2021-12-201-0/+3
| |/ / / | | | | | | | | Fixes: #23022
* | | | Merge topic 'improve-CMP0028-messages'Brad King2021-12-2011-66/+187
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea050286e7 CMP0028: Report the target whose link interface has an offending item a97c92e46e CMP0028: Report backtrace to link item rather than target creation 0dcbf4ab58 cmGeneratorTarget: Record when imported target link iface libs are done Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6810
| * | | | CMP0028: Report the target whose link interface has an offending itemBrad King2021-12-1611-59/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously items linked via the link interface of a dependency were reported in CMP0028 messages as if directly linked by a target. Clarify the messages to indicate that an offending item is actually in the link interface of a given target, regardless of its consumer. Move the check to the end of generation and look through the final set of link implementations and link interfaces that were used for generation. This avoids repeating messages on link interfaces that have multiple consumers.
| * | | | CMP0028: Report backtrace to link item rather than target creationBrad King2021-12-167-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we have proper backtraces for both `LINK_LIBRARIES` and `INTERFACE_LINK_LIBRARIES` entries, we can report them in error messages.
| * | | | cmGeneratorTarget: Record when imported target link iface libs are doneBrad King2021-12-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `GetImportLinkInterface` populates the link interface from properties of imported targets. Make it more closely match the link interface of in-project targets by recording the `LibrariesDone` field.
* | | | | Merge branch 'release-3.22'Brad King2021-12-200-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge topic 'FindGLUT-include-dirs' into release-3.22Brad King2021-12-202-1/+3
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | ae6b25d920 FindGLUT: Provide legacy GLUT_INCLUDE_DIR result in pkg-config code path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6814
* | | | | Merge topic 'FindGLUT-include-dirs'Brad King2021-12-202-1/+3
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | ae6b25d920 FindGLUT: Provide legacy GLUT_INCLUDE_DIR result in pkg-config code path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6814
| * | | | FindGLUT: Provide legacy GLUT_INCLUDE_DIR result in pkg-config code pathBrad King2021-12-172-1/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit f90d15458a (FindGLUT: Use pkg-config to find flags if available, 2021-06-11, v3.22.0-rc1~469^2) we return early if pkg-config provides the information. During review of that commit, code to populate the legacy `GLUT_INCLUDE_DIR` result variable was removed from that code path. Add code to provide it. Also fix the test case to use `GLUT_INCLUDE_DIR`, the result variable documented officially by the module. Fixes: #23018
* | | | Merge topic 'googletest-executor-error'Brad King2021-12-201-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f51987d42 GoogleTest: show test executor in error message Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6813
| * | | | GoogleTest: show test executor in error messagePaul-Antoine Arras2021-12-171-1/+6
| | | | | | | | | | | | | | | | | | | | Fixes: #22920
* | | | | Merge topic 'FindGSL-version-regex'Brad King2021-12-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 58f2708b90 FindGSL: Improve version extraction regex Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6812
| * | | | | FindGSL: Improve version extraction regexمهدي شينون (Mehdi Chinoune)2021-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #23017
* | | | | | Merge topic 'test-vsnormal-allow-intel'Brad King2021-12-201-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | d7ae61cde6 Tests: In RunCMake.GeneratorToolset accept Intel platform toolsets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6811
| * | | | | Tests: In RunCMake.GeneratorToolset accept Intel platform toolsetsWilliam R. Dieter2021-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RunCMake.GeneratorToolset test expected platform toolsets to have a name beginning with 'v' followed by one or more decimal digits, as all the Microsoft platform toolsets follow that naming convention. The Intel platform toolsets begin with "Intel" and have various additional strings depending on the compiler version. This change accepts the toolsets delivered by Intel in addition to those from Microsoft. Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
* | | | | | CMake Nightly Date StampKitware Robot2021-12-201-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2021-12-191-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2021-12-181-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'vs-csproj-scripts'Brad King2021-12-174-16/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aca153b104 VS: Add custom VCEnd labels only in C# projects Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6808
| * | | | | VS: Add custom VCEnd labels only in C# projectsSumit Bhardwaj2021-12-164-16/+17
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit dff98aa9ca (VS: add missing label in C# project-build events, 2021-12-15) the condition for adding our own `VCEnd` label was based on the project being managed or not. Since we support managed C++ projects, switch the condition to be based on whether the project is C#. Issue: #21440
* | | | | Merge topic 'filter-debug-find'Brad King2021-12-1743-10/+539
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d7b18895bc cmake: Add filtered debug-find options Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex <leha-bot@yandex.ru> Merge-request: !6778
| * | | | | cmake: Add filtered debug-find optionsJohn Parent2021-12-1743-10/+539
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `--debug-find-pkg=` option to debug find calls for specific packages. Add a `--debug-find-var=` option to debug find calls for specific return variables. Fixes: #21880
* | | | | | Merge branch 'release-3.22'Brad King2021-12-170-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge topic 'FindBoost-python-3.10' into release-3.22Brad King2021-12-171-6/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d4bb6c0c7f FindBoost: Add support for Python 3.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6809
* | \ \ \ \ \ Merge topic 'FindBoost-python-3.10'Brad King2021-12-171-6/+6
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d4bb6c0c7f FindBoost: Add support for Python 3.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6809
| * | | | | | FindBoost: Add support for Python 3.10Oleg Sidorkin2021-12-161-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regexps in FindBoost assumed that python's minor version had only one digit. That became not true for 3.10. Fixes: #23025
* | | | | | | Merge branch 'release-3.22'Brad King2021-12-170-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'release-3.21' into release-3.22Brad King2021-12-170-0/+0
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'release-3.21'Brad King2021-12-170-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'vs-intel-oneapi-toolset' into release-3.21Brad King2021-12-151-5/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !6806
* | \ \ \ \ \ \ \ Merge branch 'release-3.22'Brad King2021-12-170-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'vs-intel-oneapi-toolset' into release-3.22Brad King2021-12-171-5/+3
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| / / / / / | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | 612c0d49f4 VS: Fix detecting icx.exe with Intel Compiler toolsets newer than 2021 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6806
* | | | | | | | Merge topic 'vs-intel-oneapi-toolset'Brad King2021-12-171-5/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | 612c0d49f4 VS: Fix detecting icx.exe with Intel Compiler toolsets newer than 2021 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6806
| * | | | | | VS: Fix detecting icx.exe with Intel Compiler toolsets newer than 2021William R. Dieter2021-12-151-5/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic added by commit 7808cbd644 (CMakeDetermineCompilerId: support Intel DPC++ compiler toolset for VS gen, 2020-12-06, v3.20.0-rc1~330^2) matches a specific toolset known to be the `icx.exe` compiler, and assumes all other Intel C++ compilers (that are not DPC++) must be `icl.exe`. Since `icx.exe` is officially replacing `icl.exe`, use a regex that matches the now-fixed set of toolsets known to use `icl.exe`. Any other Intel C++ compiler will be assumed to be `icx.exe`. Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
* | | | | | CMake Nightly Date StampKitware Robot2021-12-171-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge branch 'release-3.22'Brad King2021-12-160-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
generated by cgit v0.12 at 2024-11-15 00:30:08 (GMT)