summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Apple: Properly lookup XCTest for iOS and tvOSGregor Jasny2019-05-113-0/+37
| | | | Closes: #19172
* Merge branch 'touch-after-ranlib' into release-3.14Brad King2019-05-061-0/+14
|\ | | | | | | Merge-request: !3283
| * Apple: Preserve high resolution mtime for static librariesGregor Jasny2019-05-051-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | On macOS ranlib truncates the fractional part of the static achive file modification time. If the archive and at least one contained object file were created within the same second this will make look the archive older than the object file. On subsequent ninja runs this leads to re-achiving and updating dependent targets. As a work-around we touch the archive after ranlib. Closes: #19222
* | Merge branch 'FindPython-fix-Python_RUNTIME_LIBRARY_DIRS-variable' into ↵Brad King2019-05-061-3/+6
|\ \ | | | | | | | | | | | | | | | release-3.14 Merge-request: !3287
| * | FindPython: ensure variable Python_RUNTIME_LIBRARY_DIRS is set correctlyMarc Chevrier2019-05-051-3/+6
| | |
* | | Merge branch 'fix_ios_try_compile' into release-3.14Brad King2019-05-061-1/+8
|\ \ \ | |/ / |/| | | | | Merge-request: !3272
| * | iOS: Fix try_compile FILE_COPY not to failAlexandru Croitor2019-05-061-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building for iOS, the compiled target is placed into a bundle. If a single-configuration generator is used, like Makefiles or Ninja, the try_compile FILE_COPY behavior fails to find the bundle, because it only looks for the bundle inside a Debug subfolder (presumably to support a multi-configuration generator like Xcode). Consider looking for the bundle in the root try_compile folder, as well as in the location specified by CMAKE_TRY_COMPILE_CONFIGURATION. Closes: #19211
* | | Merge branch 'FindPython-NumPy-fix-dependencies-management' into release-3.14Brad King2019-04-301-9/+13
|\ \ \ | | | | | | | | | | | | Merge-request: !3274
| * | | FindPython: NumPy: fix erroneous dependencies managementMarc Chevrier2019-04-301-9/+13
| |/ /
* | | Merge branch 'FindBoost-fix-fiber-compiler-features' into release-3.14Brad King2019-04-301-3/+11
|\ \ \ | | | | | | | | | | | | Merge-request: !3266
| * | | FindBoost: Fix compiler features for `fiber` and `context`Alex Turbov2019-04-301-0/+2
| | | |
| * | | FindBoost: Record compiler features for Boost 1.67 and aboveAlex Turbov2019-04-301-3/+9
| |/ / | | | | | | | | | | | | | | | Remove the 1.67 upper-bound on compiler feature computation so that with newer versions we at least get it mostly right. Leave a comment with notes about updating features for future versions.
* | | Merge branch 'out-of-dir-linking-private-deps' into release-3.14Brad King2019-04-305-2/+32
|\ \ \ | |/ / |/| | | | | Merge-request: !3276
| * | target_link_libraries: Fix static library private deps in other dirsBrad King2019-04-305-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit a1ad0a699b (target_link_libraries: Allow use with targets in other directories, 2018-09-07, v3.13.0-rc1~94^2) we accidentally broke the logic that adds `$<LINK_ONLY:...>` to private dependencies of static libraries in their `INTERFACE_LINK_LIBRARIES` in the case that the dependency is added from outside the directory creating the library. The check for a valid target name should apply to the original name specified by the caller and not the encoded cross-directory reference. Fixes: #19197
* | | 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
generated by cgit v0.12 at 2025-09-10 14:52:39 (GMT)