summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'file-READ_ELF-capture-error' into release-3.22Brad King2022-01-123-5/+29
|\
| * file: Restore error capture in undocumented READ_ELF modeBrad King2022-01-113-5/+29
|/
* Merge topic 'armasm-6.17' into release-3.22Brad King2022-01-071-1/+1
|\
| * ASM: Fix identification of armasm 6.17+Jukka Jalkanen2022-01-061-1/+1
|/
* Merge topic 'ci-windows-no-java' into release-3.22Brad King2021-12-221-0/+1
|\
| * ci: Explicitly disable Java tests on VS buildsBrad King2021-12-221-0/+1
|/
* Merge topic 'FindBoost-1.78' into release-3.22Brad King2021-12-211-1/+1
|\
| * FindBoost: Do not warn about now-supported version 1.78Brad King2021-12-201-1/+1
* | Merge topic 'FindGLUT-include-dirs' into release-3.22Brad King2021-12-202-1/+3
|\ \ | |/ |/|
| * FindGLUT: Provide legacy GLUT_INCLUDE_DIR result in pkg-config code pathBrad King2021-12-172-1/+3
|/
* Merge topic 'FindBoost-python-3.10' into release-3.22Brad King2021-12-171-6/+6
|\
| * FindBoost: Add support for Python 3.10Oleg Sidorkin2021-12-161-6/+6
* | Merge branch 'release-3.21' into release-3.22Brad King2021-12-170-0/+0
|\ \
| * \ Merge branch 'vs-intel-oneapi-toolset' into release-3.21Brad King2021-12-151-5/+3
| |\ \
* | \ \ Merge topic 'vs-intel-oneapi-toolset' into release-3.22Brad King2021-12-171-5/+3
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | VS: Fix detecting icx.exe with Intel Compiler toolsets newer than 2021William R. Dieter2021-12-151-5/+3
| |/
* | Merge topic 'ci-windows-no-java' into release-3.22Brad King2021-12-162-1/+2
|\ \
| * | ci: Explicitly disable Java tests on WindowsBrad King2021-12-162-1/+2
|/ /
* | Merge topic 'FindBoost-1.78' into release-3.22Brad King2021-12-161-2/+17
|\ \
| * | FindBoost: Add support for Boost 1.78Brad King2021-12-151-2/+17
|/ /
* | Merge topic 'android-system-stl' into release-3.22Brad King2021-12-141-1/+1
|\ \
| * | Android: Fix linking android_support for pre-21 system STLRyan Prichard2021-12-131-1/+1
|/ /
* | Merge topic 'python3.11-support' into release-3.22Brad King2021-12-083-3/+3
|\ \
| * | FindPython: Add support for Python 3.11Tomáš Hrnčiar2021-12-073-3/+3
|/ /
* | CMake 3.22.1v3.22.1Brad King2021-12-071-1/+1
* | Merge topic 'rel-macos-sign-notarize' into release-3.22Brad King2021-12-071-0/+118
|\ \
| * | Utilities/Release: Add script to sign/notarize macOS application bundleBrad King2021-12-061-0/+118
* | | Merge topic 'makefile-CMAKE_EXPORT_COMPILE_COMMANDS-HIP' into release-3.22Brad King2021-12-071-1/+1
|\ \ \
| * | | HIP: Enable CMAKE_EXPORT_COMPILE_COMMANDS for HIPBrad King2021-12-071-1/+1
* | | | Merge topic 'lib-arch-no-usr' into release-3.22Brad King2021-12-079-1/+125
|\ \ \ \ | |/ / / |/| | |
| * | | CMakeParseLibraryArchitecture: Fix parsing /lib/<arch> implicit object pathRaphael Gozzo2021-12-069-1/+125
|/ / /
* | | Merge topic 'ci-vs-managed' into release-3.22Brad King2021-12-061-1/+1
|\ \ \ | |/ / |/| |
| * | ci: Enable more VS tests that use managed codeBrad King2021-12-031-1/+1
|/ /
* | Merge topic 'vs-csproj-scripts' into release-3.22Brad King2021-12-037-26/+25
|\ \
| * | VS: Revert "Add missing label in C# project-build events"Brad King2021-12-027-26/+25
* | | Merge topic 'FindPkgConfig-pkgconf' into release-3.22Brad King2021-12-031-1/+1
|\ \ \ | |/ / |/| |
| * | FindPkgConfig: Restore finding pkg-config before pkgconfBrad King2021-12-021-1/+1
|/ /
* | Merge topic 'FindPython-static-libs-hint' into release-3.22Brad King2021-12-023-0/+15
|\ \
| * | FindPython: clarify static libraries hint usageMarc Chevrier2021-12-013-0/+15
* | | Merge topic 'rpath-unrecognized-format' into release-3.22Brad King2021-12-0213-4/+85
|\ \ \ | |/ / |/| |
| * | file(RPATH): Restore tolerance of unknown formats if new RPATH is emptyBrad King2021-12-0113-2/+85
| * | cmSystemTools: Remove unnecessary mark-as-used casts to voidBrad King2021-12-011-2/+0
|/ /
* | Merge topic 'doc-if-basic-expressions' into release-3.22Brad King2021-12-011-4/+15
|\ \
| * | Help: Be more explicit about the behavior of if(<string>)Craig Scott2021-12-011-4/+13
| * | Help: Explicitly state that if(ENV{some_var}) is always falseCraig Scott2021-12-011-1/+3
* | | Merge topic 'GNUInstallDirs-conda-fix' into release-3.22Brad King2021-12-011-1/+3
|\ \ \
| * | | GNUInstallDirs: Prefer system lib64 over conda lib when ambiguousRobert Maynard2021-11-301-1/+3
* | | | Merge topic 'mingw-strftime-crash' into release-3.22Brad King2021-12-011-1/+1
|\ \ \ \
| * | | | mingw: fix calling convention for strftime()Christoph Reiter2021-11-301-1/+1
|/ / / /
* | | | Merge topic 'doc-CMAKE_INSTALL_MODE' into release-3.22Brad King2021-11-302-16/+111
|\ \ \ \