summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.9.5v3.9.5Brad King2017-11-031-1/+1
|
* Merge branch 'backport-3.9-autogen-moc-predefs-no-moc-options' into release-3.9Brad King2017-11-011-3/+0
|\ | | | | | | Merge-request: !1432
| * Autogen: Don't add AUTOMOC_MOC_OPTIONS to moc-predefs commandSebastian Holtermann2017-10-311-3/+0
|/ | | | Issue: #17418
* CMake 3.9.4v3.9.4Brad King2017-10-041-1/+1
|
* Merge branch 'FindBoost-fix-policy-scope' into release-3.9Brad King2017-09-271-2/+0
|\ | | | | | | | | This has no corresponding merge-request because the branch was made as a direct fixup specific to 3.9.
| * FindBoost: Finish reverting "Simplify search in lists" for 3.9Brad King2017-09-271-2/+0
| | | | | | | | | | | | | | | | | | In commit v3.9.2~3^2 (FindBoost: Revert "Simplify search in lists.", 2017-09-05) we forgot to also revert commit commit v3.9.1~15^2 (FindBoost: pop policy stack before returning, 2017-07-24) which had been made as a fixup to the original commit. Fixes: #17309
* | CMake 3.9.3v3.9.3Brad King2017-09-201-1/+1
| |
* | Merge branch 'CTest-crash-missing-glob' into release-3.9Brad King2017-09-191-0/+2
|\ \ | | | | | | | | | Merge-request: !1289
| * | CTest: fix crash if source file for coverage cannot be foundRolf Eike Beer2017-09-191-0/+2
|/ / | | | | | | | | | | The opened XML elements were not closed, so an assert was triggered when the file was finally closed. If CMake is built with assertions disabled then an invalid XML file will be produced.
* | Merge branch 'backport-FindBoost-1.65' into release-3.9Brad King2017-09-181-3/+27
|\ \ | | | | | | | | | Merge-request: !1280
| * | FindBoost: Add support for Boost 1.65.0 and 1.65.1 to CMake 3.9Roger Leigh2017-09-181-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | Backport the changes from commit fa114e7d70 (FindBoost: Add Boost 1.65 dependencies, 2017-08-22) and commit dbba53a5aa (FindBoost: Add version 1.65.1, 2017-09-06) to CMake 3.9. Fixes: #17289
* | | Merge branch 'revert-vim-no-tabs' into release-3.9Brad King2017-09-181-1/+0
|\ \ \ | | | | | | | | | | | | Merge-request: !1273
| * | | vim: Remove default setting of expandtabMaarten de Vries2017-09-181-1/+0
| |/ / | | | | | | | | | | | | | | | | | | An update from vim-cmake-syntax by commit v3.9.0-rc1~167^2^2 (vim-cmake-syntax 2017-05-02, 2017-05-02) brought in a change to set `expandtab` in CMake language files. This should be a per-project or per-user choice instead, so drop the setting.
* | | Merge branch 'backport-autogen-target-depends' into release-3.9Brad King2017-09-1312-72/+242
|\ \ \ | | | | | | | | | | | | Merge-request: !1257
| * | | Autogen: Tests: Backport tests for _autogen target dependenciesSebastian Holtermann2017-09-1311-47/+182
| | | |
| * | | Autogen: Backport autogen target dependency as file dependency fixSebastian Holtermann2017-09-131-25/+60
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Target dependencies of the origin target were mistakenly forwarded to the _autogen target as *file* dependencies. This patch introduces proper distinction between *target* and *file* dependencies of the _autogen target. This patch also changes when PRE_BUILD is used for AUTOGEN in the Visual Studio generator. Formerly PRE_BUILD was disabled when the origin target depended on *any* other target. Now PRE_BUILD is only disabled if a dependency of the _autogen target to an additional *file* is detected. Fixes: #17278, #17205
* | | Merge branch 'bootstrap-twice-in-source' into release-3.9Brad King2017-09-131-0/+6
|\ \ \ | | | | | | | | | | | | Merge-request: !1258
| * | | bootstrap: Fix running multiple times in-sourceBrad King2017-09-131-0/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.9.0-rc1~281^2 (Use quotes for non-system includes, 2017-04-11) we include `cmConfigure.h` via `""` instead of `<>`. This breaks the `bootstrap` script when run more than once in an in-source build. In that case `cmConfigure.h` is generated next to the source files that include it, so `""`-style includes prevent the `Bootstrap.cmk/cmConfigure.h` file from being included during bootstrap. Fix this by teaching the bootstrap script to remove any `cmConfigure.h` that may have been generated by an earlier run in an in-source build. Fixes: #17082
* | | Merge branch 'backport-vs-fix-config-map' into release-3.9Brad King2017-09-132-8/+20
|\ \ \ | |/ / |/| | | | | Merge-request: !1256
| * | VS: Do not consider MAP_IMPORTED_CONFIG_<CONFIG> on non-imported targetsBrad King2017-09-132-8/+20
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.9.0-rc1~309^2 (include_external_msproject: Honor MAP_IMPORTED_CONFIG_<CONFIG>, 2017-04-04) we accidentally honor `MAP_IMPORTED_CONFIG_<CONFIG>` while generating the `.sln` file entries for normal targets. This causes `devenv.com`-driven builds to use the mapping incorrectly for normal targets. Check that a target really comes from `include_external_msproject` before considering the map. Furthermore, when we do use the map, we should only take the first entry if more than one configuration is specified. Otherwise we end up giving VS a configuration name with a `;` in it. Fixes: #17276
* | CMake 3.9.2v3.9.2Brad King2017-09-071-1/+1
| |
* | Merge branch 'backport-genex-SOURCES-test' into release-3.9Brad King2017-09-071-2/+2
|\ \
| * | Tests: Fix RunCMake.GeneratorExpression to run in CMake 3.9Brad King2017-09-071-2/+2
| | | | | | | | | | | | CMake 3.9 does not have CMP0070, so port away from it for that branch.
* | | Merge branch 'backport-irsl-vs15-future' into release-3.9Brad King2017-09-061-19/+16
|\ \ \ | | | | | | | | | | | | Merge-request: !1240
| * | | InstallRequiredSystemLibraries: Add support for future VS 2017 toolchainsBrad King2017-09-061-19/+16
| | | | | | | | | | | | | | | | | | | | | | | | Assume that all cl 19.xx versions will use the same runtime DLL pattern. Suggested-by: Tomasz Słodkowicz <slodki@users.noreply.github.com>
* | | | Merge branch 'FindBoost-fix-policy-scope' into release-3.9Brad King2017-09-051-9/+5
|\ \ \ \ | | |_|/ | |/| | | | | | Merge-request: !1238
| * | | FindBoost: Revert "Simplify search in lists."Brad King2017-09-051-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.9.0-rc1~41^2 (FindBoost: Simplify search in lists, 2017-04-23). It regressed the module by exposing issue #17257, but the fix for that issue is not suitable for inclusion in a patch release. It is simplest to revert the commit until the larger problem can be addressed. Fixes: #17252
* | | | Merge branch 'android-ndk-r16' into release-3.9Brad King2017-09-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1237
| * | | | Android: Update for NDK r16Brad King2017-09-051-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since NDK commit 90ec78ffd96b87cd75d82575587ead14d6494df1 (Remove Clang toolchain path from setup.mk, 2017-05-31) the `setup.mk` files for Clang no longer hold the path to the `toolchains/llvm` directory. It has been the same since NDK r11, so use that as the default. Fixes: #17253
* | | | Merge branch 'csharp_fix_initial_flags' into release-3.9Brad King2017-09-052-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1232
| * | | | VS: Initialize CSharp flags consistentlyMichael Stürmer2017-09-052-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Use the same environment variable for the initial flags that we use for the compiler id. Fixes: #17250
* | | | Merge branch 'findopenmp-found' into release-3.9Brad King2017-09-051-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1233
| * | | | FindOpenMP: Restore OpenMP_FOUND result variableChristian Pfeiffer2017-09-051-0/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The overhaul in commit v3.9.0-rc1~207^2~1 (FindOpenMP: Complete overhaul, 2017-04-24) documented this variable but accidentally left it unset. Fixes: #17251
* | | | Merge branch 'backport-vs-csharp-ref-no-asm' into release-3.9Brad King2017-09-056-0/+48
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1203
| * | | | VS: Do not reference output assemblies if not possible for CSharp targetMichael Stürmer2017-09-056-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.9.0-rc4~4^2 (Vs: allow CSharp targets to be linked to CXX targets, 2017-06-20) CSharp targets get `ProjectReference` entries to their dependencies. This causes VS to also reference the dependency's output assembly by default, which is incorrect for non-managed targets. Fix this by setting `ReferenceOutputAssembly` to `false` for targets that can't provide output assemblies. Unmanaged C++ targets (shared libs & executables) can still be referenced and a warning will be shown in the IDE but the build will not break anymore. Fixes: #17172
* | | | | Merge branch 'fix-genex-SOURCES' into release-3.9Brad King2017-09-016-1/+16
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | Merge-request: !1218
| * | | Genex: Fix TARGET_PROPERTY value of SOURCESBrad King2017-09-016-1/+16
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.8.0-rc1~445^2~2 (cmTarget: Move sanity checks and computed property access to callers, 2016-10-13) exposed a typo in commit v3.8.0-rc1~445^2~3 (cmGeneratorTarget: Implement cmTargetPropertyComputer interface, 2016-10-13). Together they broke the `$<TARGET_PROPERTY:mytgt,SOURCES>` generator expression in the case that the `SOURCES` target property is populated in part by the `target_sources` command. Add the missing `;`-separator. Fixes: #17243
* | | Merge branch 'fix-find-package-mode' into release-3.9Brad King2017-08-292-1/+3
|\ \ \ | | | | | | | | | | | | Merge-request: !1208
| * | | cmake: Fix --find-package mode with imported targetsBrad King2017-08-292-1/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | The change in commit v3.9.0-rc1~116^2~6 (cmakemain: use script role for -P, 2017-05-11) accidentally left project commands out of find-package mode, causing packages that provide imported targets to break. Fixes: #17124
* | | Merge branch 'cpack-dmg-iwyu' into release-3.9Brad King2017-08-291-0/+1
|\ \ \ | | | | | | | | | | | | Merge-request: !1206
| * | | cmCPackDragNDropGenerator: Add missing includeBrad King2017-08-291-0/+1
| |/ / | | | | | | | | | | | | | | | We use `std::sort` and so must include `<algorithm>`. Issue: #17233
* | | Merge branch 'revert-xcode-9-new-buildsystem-support' into release-3.9Brad King2017-08-242-13/+5
|\ \ \ | | | | | | | | | | | | Merge-request: !1183
| * | | Xcode: Revert addition of "outputPaths" to custom command build phaseBrad King2017-08-242-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.9.0~3^2 (Xcode: Add "outputPaths" to custom command script build phase, 2017-07-13) was meant to support Xcode 9's new build system. However, without matching "inputPaths", Xcode will not re-run the build phase if its outputs have already been generated. This broke the old Xcode build system too. Revert the change for now so at least the old Xcode build system works. Further investigation will be needed to add proper support for Xcode 9's new build system. Fixes: #17178
* | | | Merge branch 'ninja-cl-intl' into release-3.9Brad King2017-08-231-0/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | Merge-request: !1179
| * | | Ninja: Fix support for MSVC with non-English outputBrad King2017-08-231-0/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With MSVC the Ninja generator extracts the `cl -showIncludes` prefix. When MSVC is configured to have non-English output, e.g. via `VSLANG=2052` in the environment, then `cl` prints the prefix encoded for the current code page, which is not necessarily UTF-8 encoding. Currently we fail to convert the prefix to our internal UTF-8 encoding, but assume it is UTF-8 later. While writing `rules.ninja`, the Ninja generator converts our internal UTF-8 encoding to the current code page. The `msvc_deps_prefix =` line needs to be encoded as the current code page so that `ninja` can match in the output from `cl -showIncludes` during the build. Prior to commit v3.9.0-rc1~47^2 (codecvt: Re-implement do_out and do_unshift, 2017-05-25), the non-UTF-8 prefix extracted above was written without noticing its incorrect internal encoding. The `rules.ninja` file was successfully written, but possibly with a mangled `msvc_deps_prefix`. Since that commit the output stream correctly rejects the non-UTF-8 byte sequence and writing `rules.ninja` fails. Fix this by correctly converting the `cl -showIncludes` output from the current code page to our internal UTF-8 encoding. Fixes: #17191
* | | Merge branch 'InstallRequiredSystemLibraries-vs15.3' into release-3.9Brad King2017-08-221-11/+31
|\ \ \ | |_|/ |/| | | | | Merge-request: !1168
| * | InstallRequiredSystemLibraries: Find VS 2017 Update 3 redist directoryBrad King2017-08-211-3/+13
| | | | | | | | | | | | | | | | | | Add compiler version 19.11 to our table. Fixes: #17184
| * | InstallRequiredSystemLibraries: Factor redist name into variableBrad King2017-08-211-8/+18
| |/ | | | | | | | | | | Store the `VC###` component of the `Microsoft.VC###.CRT` directory name in a variable set based on the toolchain version. Its naming convention is changed by VS 15.3.
* | Merge branch 'revert-macos-hidpi-qt-dialog' into release-3.9Brad King2017-08-222-7/+7
|\ \ | | | | | | | | | Merge-request: !1167
| * | macOS: Revert default Hi-DPI support in applicationsBrad King2017-08-222-7/+7
| |/ | | | | | | | | | | | | | | | | | | | | This reverts commit v3.9.0-rc1~287^2 (macOS: Enable Hi-DPI support in applications by default, 2017-04-08). It breaks iOS applications that do not use their own `MACOSX_BUNDLE_INFO_PLIST` because `NSApplication` is only for macOS apps. Until more complete support for iOS is added to CMake (e.g. with a different default plist file) we must allow our default plist file to work for both macOS and iOS. Fixes: #17179
View Lorry Controller Status