summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'gettext-windows'Brad King2017-08-301-2/+6
|\ | | | | | | | | | | | | fb3a608f FindGettext: fix support for MS Windows gettext binaries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1192
| * FindGettext: fix support for MS Windows gettext binariesTomasz Słodkowicz2017-08-301-2/+6
| | | | | | | | | | Sometimes it uses filename with .exe extension so try to match filename with and without extension.
* | FindwxWidgets: Add support for Windows XP compatible builsTomasz Słodkowicz2017-08-301-0/+4
|/ | | | | | | Microsoft has dedicated toolset versions for XP compatible binaries (v110 vs. v110_xp, v141 vs. v141_xp) and CMake doesn't find wxWidgets compiled with _xp tools. This patch adds _xp to directories searched for wxWin libraries.
* Merge topic 'cpackifw-repositories-directories'Brad King2017-08-281-0/+6
|\ | | | | | | | | | | | | 5fe64511 CPackIFW: Add CPACK_IFW_REPOSITORIES_DIRECTORIES variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1150
| * CPackIFW: Add CPACK_IFW_REPOSITORIES_DIRECTORIES variableKonstantin Podsvirov2017-08-171-0/+6
| | | | | | | | | | | | Add CPACK_IFW_REPOSITORIES_DIRECTORIES variable to specify additional repositories dirs that will be used to resolve and repack dependent components
* | Merge topic 'FindQt4-do-not-assume-all-libraries-are-frameworks'Brad King2017-08-281-6/+8
|\ \ | | | | | | | | | | | | | | | | | | 33161f48 FindQt4: Do not assume all libraries are frameworks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1169
| * | FindQt4: Do not assume all libraries are frameworksJean-Christophe Fillion-Robin2017-08-211-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since on MacOSX not all modules are available as "framework" (e.g libQtUiTools.a), the assumption made in "FindQt4.cmake" is not always valid and systematically setting the imported libraries location to framework location is incorrect. This commit increases the robustness of the logic by first checking if the location exists. Fixes #17195
* | | GNUToMS: Tolerate existence of a %USERPROFILE%/source directoryAlbert Ziegenhagel2017-08-251-0/+1
| | | | | | | | | | | | | | | | | | The VS environment script we load changes the working directory to `%USERPROFILE%/source` if it exists. Set `VSCMD_START_DIR` to tell the script to retain the current working directory.
* | | Merge topic 'modernize-git-whitespace-attributes'Brad King2017-08-252-14/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ed03baa gitattributes: prefer `eol=crlf` to `-crlf` 40470031 MumpsCoverage: remove unnecessary attribute d20485d8 gitattributes: prefer `eol=lf` to `crlf=input` b85c2589 gitattributes: prefer `-text` for binary files 377f3685 gitattributes: remove unused attributes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1173
| * | | gitattributes: prefer `eol=crlf` to `-crlf`Ben Boeckel2017-08-232-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | The `crlf` attribute is deprecated in Git. This also changes the given files to be in the index using LF newlines, but they will be checked out with CRLF newlines due to the attribute.
* | | | Merge topic 'ninja-cl-intl'Brad King2017-08-241-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | de9840d1 Ninja: Fix support for MSVC with non-English output Acked-by: Kitware Robot <kwrobot@kitware.com> 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 topic 'boost-1.65'Brad King2017-08-241-3/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa114e7d FindBoost: Add Boost 1.65 dependencies e66e8e89 BoostScanDeps: Special case python and numpy and variants Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1172
| * | | | | FindBoost: Add Boost 1.65 dependenciesRoger Leigh2017-08-221-3/+27
| | |_|/ / | |/| | |
* | | | | Merge topic 'ninja-gfortran-fpreprocessed'Brad King2017-08-241-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90a34ff7 Ninja: Fix references to source files in gfortran diagnostics Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1146
| * | | | | Ninja: Fix references to source files in gfortran diagnosticsRaul Laasner2017-08-231-0/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Ninja generator preprocesses and compiles separately for Fortran. When compiling, tell gfortran that the source is already preprocessed so that it will honor the `# <line>` directives when producing diagnostics messages. Fixes: #17160
* | | | | Merge topic 'FindCurses-wide'Brad King2017-08-231-30/+81
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72343d26 Help: Add notes for topic 'FindCurses-wide' 4b02afc0 FindCurses: Add option for ncursesw detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1161
| * | | | | FindCurses: Add option for ncursesw detectionAlexandr (Sagrer) Gridnev2017-08-221-30/+81
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a remake of the patch from issue #10347 but based on current master. Works for me on Lubuntu 17.04. Fixes: #10347
* | | | | Autogen: Initializer optimizations and cleanupsSebastian Holtermann2017-08-221-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'cmake-ice37-2'Brad King2017-08-221-4/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d0a20d29 FindIce: Add support for separate Freeze NuGet package Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1152
| * | | | FindIce: Add support for separate Freeze NuGet packageRoger Leigh2017-08-171-4/+22
| |/ / /
* | | | Merge topic 'InstallRequiredSystemLibraries-vs15.3'Brad King2017-08-221-11/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23cf9e15 InstallRequiredSystemLibraries: Find VS 2017 Update 3 redist directory b45d8432 InstallRequiredSystemLibraries: Factor redist name into variable Acked-by: Kitware Robot <kwrobot@kitware.com> 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 topic 'revert-macos-hidpi-qt-dialog'Brad King2017-08-221-4/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 286c75f7 macOS: Revert default Hi-DPI support in applications Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1167
| * | | macOS: Revert default Hi-DPI support in applicationsBrad King2017-08-221-4/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 topic 'autogen-macro-names'Brad King2017-08-211-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b3d98c6e Autogen: Add release notes for AUTOMOC_MACRO_NAMES 7529d84f Autogen: Add documentation for AUTOMOC_MACRO_NAMES 05891d8f Autogen: Add test for AUTOMOC_MACRO_NAMES 93f0ba28 Autogen: Add AUTOMOC_MACRO_NAMES support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1156
| * | | Autogen: Add AUTOMOC_MACRO_NAMES supportSebastian Holtermann2017-08-181-0/+1
| | |/ | |/| | | | | | | Closes #17176
* | | Merge topic 'findcuda_dont_quote_COMPILE_DEFINITIONS'Brad King2017-08-211-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | c1f4f13d FindCUDA: Use long brackets to handle spaces in CUDA_NVCC_COMPILE_DEFINITIONS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1139
| * | FindCUDA: Use long brackets to handle spaces in CUDA_NVCC_COMPILE_DEFINITIONSRobert Maynard2017-08-151-1/+1
| | | | | | | | | | | | Fixes #16510. Quoting of compile definitions breaks string value definitions
* | | Merge topic 'CPackRPM-new-debuginfo'Brad King2017-08-161-2/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 48fa4c0d CPackRPM: Restore old style debuginfo creation for rpm >= 4.14 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1099
| * | | CPackRPM: Restore old style debuginfo creation for rpm >= 4.14Björn Esser2017-08-161-2/+10
| | | |
* | | | Merge topic 'ice-3.7.0'Brad King2017-08-161-124/+182
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5868be86 FindIce: Add support for Ice 3.7.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1137
| * | | | FindIce: Add support for Ice 3.7.0Roger Leigh2017-08-121-124/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Search for NuGet packages on Windows, which is the new way the official binary builds are distributed for 3.7.0 - Search for C++11 versions of libraries, with "++11" suffix, taking Windows naming inconsistencies into account (Windows libraries have a "37" suffix, but this is placed /before/ the "++11". - Add new Ice 3.7 programs - Document new Ice 3.7 components - Add debug output for search suffixes - Simplify debug logic
* | | | | Merge topic 'FindCygwin-fix-regression'Brad King2017-08-161-5/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a428b87c Merge branch 'backport-FindCygwin-fix-regression' into FindCygwin-fix-regression 62930253 FindCygwin: Fix regression when CYGWIN_INSTALL_PATH is already set Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1128
| * \ \ \ \ Merge branch 'backport-FindCygwin-fix-regression' into FindCygwin-fix-regressionBrad King2017-08-151-5/+8
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | 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 topic 'debian_clang_binutils'Brad King2017-08-161-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 630235bd Clang: Find version-suffixed LLVM/Clang binutils Acked-by: Kitware Robot <kwrobot@kitware.com> 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 topic 'cuda-device-link-ccbin'Brad King2017-08-161-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe45d13a CUDA: Pass host compiler to nvcc while device linking Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !1138
| * | | | CUDA: Pass host compiler to nvcc while device linkingMaikel van den Hurk2017-08-151-2/+2
| |/ / /
| * | | Merge branch 'android-plain-sysroot' into release-3.9Brad King2017-08-031-3/+9
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !1101
| * \ \ \ Merge branch 'UseSWIG-Java-enabled' into release-3.9Brad King2017-08-021-2/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1095
| * \ \ \ \ Merge branch 'FindJava-fix-1.6-registry' into release-3.9Brad King2017-08-021-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1079
| * \ \ \ \ \ Merge branch 'FindJava_earlyAccessDebian' into release-3.9Craig Scott2017-08-021-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested-by: Felix Geyer <debfx@fobos.de> Merge-request: !1080
* | \ \ \ \ \ \ Merge topic 'cpack-deb-ipk'Brad King2017-08-151-3/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a17ef574 CPackDeb: Loosen filename requirement to allow for .ipk Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1093
| * | | | | | | | CPackDeb: Loosen filename requirement to allow for .ipkNils Gladitz2017-08-121-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OPKG packaging system uses deb like package files with an .ipk extension. Allow the DEB generator to be used in that context.
* | | | | | | | | Merge topic 'cpackifw-package-file-extension'Brad King2017-08-151-0/+13
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 45623e72 CPackIFW: Add CPACK_IFW_PACKAGE_FILE_EXTENSION variable Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Craig Scott <craig.scott@crascit.com> Merge-request: !1117
| * | | | | | | | CPackIFW: Add CPACK_IFW_PACKAGE_FILE_EXTENSION variableKonstantin Podsvirov2017-08-091-0/+13
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CPACK_IFW_PACKAGE_FILE_EXTENSION variable to customize target binary format.
* | | | | | | | CPack: additional CPACK_COMPONENTS_ALL documentationDomen Vrankar2017-08-121-0/+10
| | | | | | | |
generated by cgit v0.12 at 2024-10-19 11:34:26 (GMT)