summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Merge branch 'debian_clang_binutils' into release-3.9Brad King2017-08-151-0/+8
|\ \ | | | | | | | | | Merge-request: !1127
| * | Clang: Find version-suffixed LLVM/Clang binutilsSylvain Joubert2017-08-151-0/+8
| |/ | | | | | | | | | | | | | | | | Debian renames all LLVM/Clang binaries with a version suffix to allow multiple versions to be installed at the same time. While there is a version-agnostic package that adds a symlink to provide the standard binary names, if only the versioned packages are installed, binaries must be found as `binary-x.y`. In any case, using the same version of the `binutils` as the compiler seems better.
* | Merge branch 'cuda-device-link-ccbin' into release-3.9Brad King2017-08-151-2/+2
|\ \ | | | | | | | | | Merge-request: !1138
| * | CUDA: Pass host compiler to nvcc while device linkingMaikel van den Hurk2017-08-151-2/+2
| |/
* | Merge branch 'backport-FindCygwin-fix-regression' into release-3.9Brad King2017-08-151-5/+8
|\ \ | | | | | | | | | Merge-request: !1128
| * | FindCygwin: Fix regression when CYGWIN_INSTALL_PATH is already setTibor Szabo2017-08-151-5/+8
| |/ | | | | | | | | | | | | | | | | | | The change in commit v3.9.0-rc1~54^2 (FindCygwin: Use find_program instead of find_path, 2017-05-18) broke cases when `CYGWIN_INSTALL_PATH` is already set, e.g. on the command-line or by an earlier call to `find_package(Cygwin)`. Since `find_program` now finds the actual `cygwin.bat` file, use a separate cache entry to save the location and then compute `CYGWIN_INSTALL_PATH`. If `CYGWIN_INSTALL_PATH` is already set, use that to avoid `find_program` having to search.
* | Merge branch 'backport-autogen-autouic-lookup' into release-3.9Brad King2017-08-159-28/+169
|\ \ | |/ |/| | | Merge-request: !1140
| * Autogen: Extend AUTOUIC search paths testSebastian Holtermann2017-08-156-1/+105
| |
| * Autogen: Update AUTOUIC documentation for search pathsSebastian Holtermann2017-08-151-6/+13
| |
| * Autogen: Restore AUTOUIC lookup paths from 3.8.2Sebastian Holtermann2017-08-152-21/+51
|/ | | | | | | | | | | | | | | | | | When encountering an `#include "<PATH>ui_<BASE>.h"` statement, search for `<BASE>.ui` in - <SOURCE_DIR>/<BASE>.ui - <SOURCE_DIR>/<PATH><BASE>.ui - <AUTOUIC_SEARCH_PATH>/<BASE>.ui - <AUTOUIC_SEARCH_PATH>/<PATH><BASE>.ui In CMake 3.8.2 the lookup list was - <SOURCE_DIR>/<BASE>.ui In CMake 3.9.[01] the lookup list was - <SOURCE_DIR>/<PATH><BASE.ui> - <AUTOUIC_SEARCH_PATH>/<PATH><BASE>.ui Closes #17168
* CMake 3.9.1v3.9.1Brad King2017-08-101-1/+1
|
* Merge branch 'doc-CMP0069-typos' into release-3.9Brad King2017-08-101-4/+4
|\ | | | | | | Merge-request: !1122
| * Help: Fix module and function names in CMP0069 examplesRuslan Baratov2017-08-101-4/+4
| | | | | | | | Fixes: #17153
* | Merge branch 'find-package_root-disable' into release-3.9Brad King2017-08-1014-54/+44
|\ \ | | | | | | | | | Merge-request: !1116
| * | find_*: Disable the PACKAGE_ROOT search path group for CMake 3.9Brad King2017-08-0814-54/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the feature added by commit v3.9.0-rc1~71^2~2 (find_*: Add a new PackageRoot search path group, 2017-05-03) and remove documentation added by commit v3.9.0-rc1~71^2 (find_*: Add docs for PackageRoot search path group, 2017-05-03). Unfortunately the name `<pkg>_ROOT` may already be set by projects for their own incompatible purposes. Disable the behavior change for now to fix the regression for CMake 3.9. We can restore it later with a policy. In order to keep the implementation and tests working, add an undocumented variable we can use in the tests to enable the behavior before the policy is introduced. Fixes: #17144
* | | Merge branch 'autogen-create-include-dir' into release-3.9Brad King2017-08-081-0/+11
|\ \ \ | | | | | | | | | | | | Merge-request: !1113
| * | | Autogen: Always create AUTOMOC/AUTOUIC include directorySebastian Holtermann2017-08-081-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The **AUTOGEN** include directory was always passed to the compiler but only generated on demand. To avoid compiler complaints when using `-Wmissing-include-dirs` make sure the directory gets created always. Closes #17147
* | | | Merge branch 'find-package_root-test-regex' into release-3.9Brad King2017-08-086-465/+480
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1115
| * | | | Tests: Simplify RunCMake.find_package PackageRoot case regexesBrad King2017-08-086-465/+480
| | |/ / | |/| |
* | | | Merge branch 'update-expat' into release-3.9Brad King2017-08-0812-246/+845
|\ \ \ \ | |_|/ / |/| | | | | | | Merge-request: !1110
| * | | expat: Update CMake build for 2.2.3Brad King2017-08-071-3/+4
| | | |
| * | | Merge branch 'upstream-expat' into update-expatBrad King2017-08-0710-240/+838
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * upstream-expat: expat 2017-08-02 (97c6bd01)
| | * | | expat 2017-08-02 (97c6bd01)Expat Upstream2017-08-0711-394/+846
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libexpat/libexpat.git at commit 97c6bd01990090d4015364ae37dd141f3c39a30f (R_2_2_3).
| * | | | expat: Update script to get Expat 2.2.3Brad King2017-08-071-3/+3
| | | | |
* | | | | Merge branch 'add-package_root-to-find_package' into release-3.9Brad King2017-08-0314-461/+940
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | Merge-request: !1082
| * | | | find_package: Split PACKAGE_ROOT tests to work with smaller regexChuck Atkins2017-08-027-846/+872
| | | | |
| * | | | find_package: Fix PACKAGE_ROOT test to check find_pacakge(CONFIG) mode.Chuck Atkins2017-07-287-99/+531
| | | | |
| * | | | find_package: Add missing PACKAGE_ROOT_PATH search path implementation.Chuck Atkins2017-07-282-0/+21
| | |_|/ | |/| |
* | | | Merge branch 'android-plain-sysroot' into release-3.9Brad King2017-08-031-3/+9
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1101
| * | | | Android: Fix support for CMAKE_SYSROOT without CMAKE_SYSROOT_COMPILEBrad King2017-08-031-3/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If `CMAKE_SYSROOT` is set by the user (e.g. via the toolchain file) then we do not set `CMAKE_SYSROOT_COMPILE` to our default. Fix our references to the sysroot's `/usr/include` directory to use `CMAKE_SYSROOT_COMPILE` only if it is set and else `CMAKE_SYSROOT`. Fixes: #17096
* | | | Merge branch 'vs-VCTargetsPath-force-config' into release-3.9Brad King2017-08-031-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1100
| * | | | VS: Fix VCTargetsPath detectionBrad King2017-08-031-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some environments MSBuild chooses the `Release` configuration even though only `Debug` is available in our detection project. Force use of the `Debug` configuration with a command-line option. Fixes: #17118
* | | | Merge branch 'doc-release-notes-orphan' into release-3.9Brad King2017-08-031-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1077
| * | | | Help: Silence warning about document not included in toctreeBjörn Esser2017-08-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | When not using the html or text builders, `Help/index.rst` does not include `Help/release/index.rst` in the toctree. Silence the warning.
* | | | | Merge branch 'server-fix-crash' into release-3.9Brad King2017-08-021-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1096
| * | | | | server: Fix crash on missing cache entriesLaurent Rineau2017-08-021-1/+3
| | |/ / / | |/| | | | | | | | | | | | | Test for nullptr before constructing std::string.
* | | | | Merge branch 'UseSWIG-Java-enabled' into release-3.9Brad King2017-08-021-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1095
| * | | | | UseSWIG: Fix when Java is enabled as a languageBrad King2017-08-021-2/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.8.0-rc1~251^2 (UseSWIG: Record generated java files as custom command outputs, 2016-11-28) the generated `.java` files are listed as sources in the call to `add_library` by swig_add_library. They are listed only as the outputs of custom commands and not intended for compilation as part of the library. Reported-by: Alan W. Irwin <irwin@beluga.phys.uvic.ca>
* | | | | Merge branch 'FindJava-fix-1.6-registry' into release-3.9Brad King2017-08-021-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1079
| * | | | | FindJava: fix hint for windows jre 1.6Rechi Rechi2017-08-021-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Fix typo in commit v3.8.0-rc1~112^2 (FindJava: add hints for jre, 2017-01-11).
* | | | | Merge branch 'sphinx-pre-1.2' into release-3.9Brad King2017-08-021-2/+15
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | Merge-request: !1089
| * | | | Utilities/Sphinx: Restore compatibility with Sphinx pre-1.2Björn Esser2017-08-021-2/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.8.0-rc2~28^2~2 (Utilities/Sphinx: Port cmake extension to Sphinx 1.4, 2017-02-09) we use the `sphinx.version_info` tuple. However, it was added in Sphinx v1.2 so the check breaks compatibility with older versions. Revise our check to assume Sphinx pre-1.2 if the version tuple does not exist.
* | | | Merge branch 'FindJava_earlyAccessDebian' into release-3.9Craig Scott2017-08-021-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Tested-by: Felix Geyer <debfx@fobos.de> Merge-request: !1080
generated by cgit v0.12 at 2025-02-19 10:04:32 (GMT)