summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindPython: NumPy: fix erroneous dependencies managementMarc Chevrier2019-04-301-9/+13
|
* CMake 3.14.3v3.14.3Brad King2019-04-221-1/+1
|
* Merge branch 'findqt3-hints-fix' into release-3.14Brad King2019-04-221-5/+7
|\ | | | | | | Merge-request: !3254
| * FindQt3: Restore missing lib and bin path suffixesChristian Pfeiffer2019-04-221-5/+7
| | | | | | | | | | | | | | | | | | Restore path suffixes incorrectly removed by commit a62d50ec56 (Modules: Replace coded PATHS with PATH_SUFFIXES, 2017-11-20, v3.11.0-rc1~293^2). Hints do not participate in the usual bin/lib subdirectory search that `<PackangeName>_ROOT` or `CMAKE_PREFIX_PATH` exhibit. Fixes: #19185
* | Merge branch 'vs-default-platform' into release-3.14Brad King2019-04-1910-3/+40
|\ \ | | | | | | | | | Merge-request: !3246
| * | VS: Provide the default platform name to project codeBrad King2019-04-1910-3/+40
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The value of `CMAKE_VS_PLATFORM_NAME` is computed by Visual Studio generators based on `CMAKE_GENERATOR_PLATFORM` or some default. Prior to the VS 2019 generator, the default was always `Win32`. However, for the `Visual Studio 16 2019` generator, the default is based on the host platform. Store the default in a new `CMAKE_VS_PLATFORM_NAME_DEFAULT` variable for use by project code. This is particularly useful in toolchain files because they are allowed to set `CMAKE_GENERATOR_PLATFORM` and so `CMAKE_VS_PLATFORM_NAME` is not yet known. Of course the toolchain file author knows whether it will set `CMAKE_GENERATOR_PLATFORM`, and if not then `CMAKE_VS_PLATFORM_NAME_DEFAULT` provides the platform name that will be used. Fixes: #19177
* | Merge branch 'FindOpenGL-libglvnd-subdir' into release-3.14Brad King2019-04-171-0/+3
|\ \ | | | | | | | | | Merge-request: !3236
| * | FindOpenGL: look for GLVND libraries with a libglvnd suffixBen Boeckel2019-04-171-0/+3
| |/ | | | | | | | | On CentOS 6.10, the libglvnd package from EPEL installs its libraries under a libglvnd subdirectory.
* | Merge branch 'Boost-Gentoo' into release-3.14Brad King2019-04-163-1/+31
|\ \ | | | | | | | | | Merge-request: !3237
| * | FindBoost: Fix detection with version suffixes on GentooRolf Eike Beer2019-04-163-1/+31
| |/ | | | | | | | | | | | | | | | | The Gentoo case added by commit 1673923c30 (FindBoost: Add support for Boost 1.67 with Python version suffixes, 2018-03-18, v3.11.0~3^2) left out the `.` version component separator and instead duplicated the RPM case. Add the missing `.` now. Fixes: #18743
* | Merge branch 'vs2019-redist' into release-3.14Brad King2019-04-151-2/+5
|\ \ | | | | | | | | | Merge-request: !3233
| * | IRSL: Update redist directory for VS 2019 update 1Brad King2019-04-151-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | VS 2019 Update 1 will fix its redist directories to be named `VC142` instead of `VC141`. It will also use cl `19.21` instead of `19.20` so we can use that to distinguish the versions. Fixes: #19131
* | | Merge branch 'backport-FindBoost-msvc-toolset-14.2' into release-3.14Brad King2019-04-121-5/+20
|\ \ \ | |_|/ |/| | | | | Merge-request: !3221
| * | FindBoost: Add support for MSVC toolset version 14.2Brad King2019-04-121-5/+20
|/ / | | | | | | Generalize the logic to express compatibility among 14.x versions.
* | CMake 3.14.2v3.14.2Brad King2019-04-121-1/+1
| |
* | Merge branch 'fix-overlay-icon-windows' into release-3.14Brad King2019-04-111-1/+0
|\ \ | | | | | | | | | Merge-request: !3217
| * | cmake-gui: Fix icon overlay on windowsJulien Jomier2019-04-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 9175a378f5 (QtDialog: Add windows taskbar progress, 2018-11-17, v3.14.0-rc1~330^2) we've added a missing overlay icon. This results in Windows falling back to a default overlay icon. Simply drop this line. Fixes: #19160
* | | Merge branch 'xcode-extra-sources' into release-3.14Brad King2019-04-112-18/+30
|\ \ \ | | | | | | | | | | | | Merge-request: !3208
| * | | Xcode: Avoid mutating App Bundle targets during generationBrad King2019-04-112-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For `MACOSX_BUNDLE` targets we generate an `Info.plist` automatically and add it to the sources presented to Xcode. Avoid mutating the original target's list of sources to achieve this. Otherwise when we generate the same target again (e.g. in a sub-project's Xcode file) it will look different than the first time and possibly break invariants. Fixes: #19114
| * | | Xcode: Factor out duplicate source group code into lambdaBrad King2019-04-111-11/+10
| |/ /
* | | Merge branch 'fix-submit-url' into release-3.14Craig Scott2019-04-091-1/+1
|\ \ \ | | | | | | | | Merge-request: !3206
| * | | Modules/CTest: Fix SubmitURLRegina Pfeifer2019-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | Problem appeared in d6475daa79 (Modules/CTest: Set SubmitURL, 2018-12-08). Fixes: #19099
* | | | Merge branch 'backport-cmake-gui-windows-theme' into release-3.14Brad King2019-04-081-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3205
| * | | | cmake-gui: Fix theme on Windows with Qt >= 5.10mistersandman2019-04-081-0/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | In Qt 5.10 the theme support moved to a separate QWindowsVistaStyle plugin. Issue: #19147
* | | | Merge branch 'backport-implicit-includes-relative' into release-3.14Brad King2019-04-0825-19/+72
|\ \ \ \ | |_|/ / |/| | | | | | | Merge-request: !3204
| * | | Fix implicit include directory extraction for adaptive relative pathsBrad King2019-04-086-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases GCC reports *relative* implicit include directories. They are computed adaptively with respect to the current working directory such that the effective implicit include directory is an unchanging absolute path. Teach our implicit include directory extraction to recognize such paths and normalize them. Fixes: #19133
| * | | Tests: Teach RunCMake.ParseImplicitIncludeInfo to match output by regexBrad King2019-04-0816-17/+17
| | | |
| * | | Tests: Clarify hand-written cases in RunCMake.ParseImplicitIncludeInfoBrad King2019-04-085-2/+2
| |/ /
* | | Merge branch 'vs2019-redist' into release-3.14Brad King2019-04-042-10/+18
|\ \ \ | | |/ | |/| | | | Merge-request: !3186
| * | IRSL: Fix discovery of VS 2019 v142 toolset redistributablesBrad King2019-04-041-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since VS 2017's v141 toolset there is no longer a simple equation to calculate the redist name, dll version, and VS IDE version from just the MSVC toolset version. Refactor the logic to use hard-coded values and warn when a new version is not supported. Fixes: #19125
| * | MSVC: Fix MSVC_TOOLSET_VERSION for VS 2019 v142 toolsetBrad King2019-04-031-1/+4
| |/ | | | | | | | | | | | | | | This was forgotten in commit 626c51f47b (VS: Update for Visual Studio 2019 Preview 2, 2019-01-24, v3.14.0-rc1~74^2) when the toolset was first renumbered to `v142`. Issue: #19125
* | Merge branch 'armcc-compiler-id' into release-3.14Brad King2019-04-041-1/+1
|\ \ | |/ |/| | | Merge-request: !3187
| * ARMCC: Do not identify ARMClang as ARMCCBrad King2019-04-031-1/+1
|/ | | | | | | | | | Since commit 8f8d056051 (ARMCC: Fix identification of ARM compiler when it defines GNU macros, 2019-03-20, v3.14.1~10^2) we consider ARMCC before Clang or GNU compilers. Since armclang also defines `__ARMCC_VERSION` it is now mistaken for ARMCC. Extend the check for ARMCC to also verify that `__clang__` is not defined. Issue: #19065
* CMake 3.14.1v3.14.1Brad King2019-03-291-1/+1
|
* Merge branch 'implicit-includes' into release-3.14Brad King2019-03-2917-72/+92
|\ | | | | | | Merge-request: !3157
| * ParseImplicitIncludeInfo: Canonicalize implicit include dirsBrad King2019-03-2917-72/+92
| | | | | | | | | | | | | | | | | | | | | | | | The implicit include directory extraction added by commit 5990ecb741 (Compute implicit include directories from compiler output, 2018-12-07, v3.14.0-rc1~108^2) leaves paths like `/usr/lib/../include` unchanged. Fix the logic to canonicalize such paths (e.g. to `/usr/include`) as we do for implicit link directories already. This is important to ensure the set of implicit directories is represented in the same form as the include directories that will be compared to them. Issue: #19095
* | Merge branch 'implicit-includes-autogen' into release-3.14Brad King2019-03-291-8/+13
|\ \ | | | | | | | | | Merge-request: !3159
| * | Autogen: Do not treat hard-coded -I/usr/include exclusion as implicit includeSebastian Holtermann2019-03-281-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `cmLocalGenerator::GetIncludeDirectoriesImplicit` method is called by `cmQtAutoGenInitializer` to get the compiler's list of implicit include directories. Since commit 557b2d6e65 (Fix regression in -I/usr/include exclusion logic, 2019-02-13, v3.14.0-rc2~6^2~2) the method hard-codes exclusion of `/usr/include` for historical reasons. However, it should not be reported as a real implicit include directory unless the compiler really has it. Refactor the logic to distinguish the hard-coded exclusion of `/usr/include` from the real list of implicit include directories. Fixes: #19100
* | | Merge branch 'ifw_group_option_parsing' into release-3.14Brad King2019-03-291-0/+6
|\ \ \ | | | | | | | | | | | | Merge-request: !3160
| * | | CPackIFW: Add missing cpack_ifw_configure_component_group option processingClément Rezvoy2019-03-281-0/+6
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Both commit 88ecfd8ba1 (CPackIFW: Add some options, 2016-11-11, v3.8.0-rc1~248^2) and commit e5089c562c (CPackIFW: Add some options, 2017-01-24, v3.8.0-rc1~53^2) added some options to this macro's documentation and implementation, but the actual processing of the parsed options was never added. Add it now. Reviewed-by: Konstantin Podsvirov <konstantin@podsvirov.pro>
* | | Merge branch 'backport-kwsys-SystemTools-copy-self' into release-3.14Brad King2019-03-271-4/+4
|\ \ \ | |_|/ |/| | | | | Merge-request: !3145
| * | cmake: Fix '-E copy foo .' to avoid clobbering fileBrad King2019-03-261-4/+4
| |/ | | | | | | | | | | | | Backport KWSys commit 92334e7670 (SystemTools: CopyFileAlways: avoid copying file over self, 2019-03-25) to the CMake 3.14 release branch. Fixes: #19075
* | Merge branch 'FindFontconfig-var-case' into release-3.14Brad King2019-03-274-32/+46
|\ \ | | | | | | | | | Merge-request: !3153
| * | FindFontconfig: Convert module variables to camel caseBrad King2019-03-264-32/+46
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our documented standard for find module variable names is to match the case of the find module package name. This was overlooked when the module was added by commit 84e7920b3a (FindFontconfig: Add module to find Fontconfig, 2018-09-27, v3.14.0-rc1~523^2). The module was released with the upper case names in CMake 3.14.0, so fix it to have camel case names in 3.14.1. This is incompatible but anyone using a given release series should be using the latest patch on it and we've made breaking fixups on newly released features like this before. Reported-by: Christophe Giboudeaux <christophe@krop.fr> Fixes: #19094
* | Merge branch 'jacoco_parser_crash' into release-3.14Brad King2019-03-271-0/+1
|\ \ | | | | | | | | | Merge-request: !3147
| * | ctest_coverage: fix out-of-bounds index in Jacoco parserSylvain Joubert2019-03-261-0/+1
| |/ | | | | | | | | | | | | | | | | | | When the current source file is not found the FilePath variable was left with the previous path content. In case the previous file had less lines than the current one and there are 'line' entries for the current one with higher number we ended up in a buffer overflow while indexing the previous file entry with a line number higher. By clearing the FilePath, the empty() guard triggers correctly on an empty path and it avoid modifying the wrong data.
* | Merge branch 'cuda-bracket-output' into release-3.14Brad King2019-03-261-0/+5
|\ \ | | | | | | | | | Merge-request: !3151
| * | CUDA: Tolerate square brackets in PROMPT environment variableBrad King2019-03-261-0/+5
| |/ | | | | | | | | | | | | The `PROMPT` environment variable affects nvcc's output. Fix our parsing of that output to tolerate square brackets. Fixes: #19089
* | Merge branch 'toolchain-include_directories' into release-3.14Brad King2019-03-257-1/+34
|\ \ | | | | | | | | | Merge-request: !3140
| * | Restore support for include_directories() in toolchain filesBrad King2019-03-257-1/+34
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any `include_directories()` calls in toolchain files are used during our ABI detection step even though it does not include any system headers. Since commit 5990ecb741 (Compute implicit include directories from compiler output, 2018-12-07, v3.14.0-rc1~108^2), that check is also used to detect implicit include directories. Any `include_directories()` in a toolchain file are detected as implicit and later excluded from explicit specification on compiler command lines, thus breaking the purpose of the calls in the first place. Fix the implicit include directory detection step to avoid using paths from `include_directories()` calls in the toolchain file. Fixes: #19079
generated by cgit v0.12 at 2024-11-12 20:17:46 (GMT)