summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | |
* | | | | | | | Merge topic 'FindCUDA-superseded'Brad King2017-08-111-0/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae813b6b FindCUDA: Document that module has been superseded Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1124
| * | | | | | | | FindCUDA: Document that module has been supersededBrad King2017-08-101-0/+14
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note at the top of the module documentation to point readers at the first-class support for the CUDA language.
* | | | | | | | Merge topic 'findcuda_dont_ignore_CUDA_USE_STATIC_CUDA_RUNTIME'Brad King2017-08-111-2/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d9c8aa47 FindCUDA: Always obey the CUDA_USE_STATIC_CUDA_RUNTIME option. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1123
| * | | | | | | | FindCUDA: Always obey the CUDA_USE_STATIC_CUDA_RUNTIME option.Robert Maynard2017-08-101-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #17150, where the FindCUDA would incorrectly handle CUDA_USE_STATIC_CUDA_RUNTIME being set to false.
* | | | | | | | | FindCUDA: Add CUDA9/Volta recognitionBoris Fomitchev2017-08-101-2/+10
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge topic 'gtest-dynamic-discovery'Brad King2017-08-083-17/+301
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bfcda401 Add dynamic test discovery for for Google Test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1056
| * | | | | | | | Add dynamic test discovery for for Google TestMatthew Woehlke2017-07-273-17/+301
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new gtest_discover_tests function to GoogleTest.cmake, implementing dynamic test discovery (i.e. tests are discovered by actually running the test executable and asking for the list of available tests, which is used to dynamically declare the tests) rather than the source-parsing approach used by gtest_add_tests. Compared to the source-parsing approach, this has the advantage of being robust against users declaring tests in unusual ways, and much better support for advanced features such as parameterized tests. A unit test, modeled after the TEST_INCLUDE_DIR[S] test, is also included. Note that the unit test does not actually require that Google Test is available. The new functionality does not actually depend on Google Test as such; it only requires that the test executable lists tests in the expected format when invoked with --gtest_list_tests, which the unit test can fake readily.
* | | | | | | | | FindPkgConfig: On FreeBSD search in `libdata/pkgconfig`Shin-ya Murakami2017-08-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pkgconfig dir is placed at `${PREFIX}/libdata/pkgconfig` on FreeBSD instead of `${PREFIX}/lib/pkgconfig`, where `${PREFIX}` is `/usr/local` as default.
* | | | | | | | | Merge topic 'FindCygwin-64-bit'Brad King2017-08-041-4/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0184531a FindCygwin: Look for Cygwin in C:\Cygwin64. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1091
| * | | | | | | | | FindCygwin: Look for Cygwin in C:\Cygwin64.Gerald Combs2017-08-041-4/+6
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Add "C:\Cygwin64" to the list of Cygwin search paths.
* | | | | | | | | Merge topic 'set_IAR_excetion_option'Brad King2017-08-042-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 168b42d2 IAR: Enable extensions by default Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1081
| * | | | | | | | | IAR: Enable extensions by defaultNorbert Lange2017-08-032-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the variable added by commit a2112257 (Add infrastructure to use language extensions without any standard, 2017-06-29) for IAR. This was accidentally left out of commit d8e6cd9e (IAR: Improve support for IAR ARM Compiler, 2017-06-15).
* | | | | | | | | | Merge topic 'FindHDF5-importedconf-fix'Brad King2017-08-041-13/+64
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4956fc26 FindHDF5: fixes for HL when using an imported config 4150048a FindHDF5: unset some variables 9310d008 FindHDF5: for a static imported config, use CONFIG-specific library fc982844 FindHDF5: fix hdf5-config case with more than one configuration Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1064
| * | | | | | | | | | FindHDF5: fixes for HL when using an imported configKris Thielemans2017-08-031-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - some variables did not have the appropriate HL infix - some logic was not yet implemented for HL
| * | | | | | | | | | FindHDF5: unset some variablesKris Thielemans2017-08-031-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prefixed some local variables with _hdf5 and unset them at the end (still more of these to do)
| * | | | | | | | | | FindHDF5: for a static imported config, use CONFIG-specific libraryKris Thielemans2017-08-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | first check the LOCATION_<CONFIG> propertiy to find the library, then LOCATION
| * | | | | | | | | | FindHDF5: fix hdf5-config case with more than one configurationKris Thielemans2017-08-031-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Select a configuration as the first of the following available: * MAP_IMPORTED_CONFIG_<CONFIG> * ${CMAKE_BUILD_TYPE}, RELWITHDEBINFO, RELEASE, DEBUG * First entry in IMPORTED_CONFIGURATIONS Fixes: #17039
* | | | | | | | | | | Merge topic 'android-plain-sysroot'Brad King2017-08-041-3/+9
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 68d67c82 Android: Fix support for CMAKE_SYSROOT without CMAKE_SYSROOT_COMPILE Acked-by: Kitware Robot <kwrobot@kitware.com> 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