summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge topic 'FindwxWidgets-verify-wx-config'Brad King2017-04-211-0/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8b77084 FindwxWidgets: Verify existence of libraries reported by wx-config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !704
| * | | | | FindwxWidgets: Verify existence of libraries reported by wx-configJan Mrázek2017-04-201-0/+22
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the Ubuntu package `libwxgtk3-dev` is not installed, FindwxWidgets succeeds even the required libraries are not actually found. The reason for that is that `wx-config` does not perform any kind of check and uses hard-coded values. This affects e.g. KiCAD build process and makes it fail with a confusing error message [1]. The solution is to check for presence of every library file obtained from `wx-config`. [1] https://bugs.launchpad.net/kicad/+bug/1630020
* | | | | Merge topic 'autogen-fixes'Brad King2017-04-213-0/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | 09035319 Autogen: Pass explicit predefines header to moc if possible Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !671
| * | | | Autogen: Pass explicit predefines header to moc if possibleAleix Pol2017-04-203-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt is relying on whoever calls moc to include a file with the predefined values that will be used by the compiler, otherwise moc takes wrong paths and weird things happen. Instead, generate an include file and feed it to all mocs to make sure it's generating correct code. Co-Author: Sebastian Holtermann <sebholt@xwmw.org> Fixes: #16640
* | | | | Merge topic 'remove-vs7.1-generator'Brad King2017-04-206-30/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c94f1bcf Drop Visual Studio 7 .NET 2003 generator a4452fd8 cmGlobalVisualStudioGenerator: Drop VS7 enumeration value 6e66fe5f cmGlobalVisualStudio8Generator: Drop unused GetDocumentation method Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !723
| * | | | | Drop Visual Studio 7 .NET 2003 generatorBrad King2017-04-196-30/+4
| | | | | | | | | | | | | | | | | | | | | | | | This generator has been deprecated since CMake 3.6. Remove it.
* | | | | | Merge topic 'FindBoost-fix-backslash-tolerance'Brad King2017-04-201-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2516bccd FindBoost: Restore tolerance of backslashes in paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !721
| * | | | | | FindBoost: Restore tolerance of backslashes in pathsAlex Turbov2017-04-191-2/+3
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.8.0-rc1~136^2 (FindBoost: Search official location of prebuilt binaries on Windows, 2016-12-21) we pass input paths through `_Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS` in more places than before. This broke tolerance of backslashes in paths provided by the user due to the macro argument re-parsing. Turn `_Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS` into a function instead of macro to avoid re-parsing of macro arguments. Fixes: #16816
* | | | | | Merge topic 'FindOpenSSL-more-precompiled'Brad King2017-04-201-0/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 16ef163f FindOpenSSL: Add more library name alternatives Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !713
| * | | | | FindOpenSSL: Add more library name alternativesAlex Turbov2017-04-191-0/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Add names found in OpenSSL 1.1.0 builds from [1]. [1] https://www.npcglib.org/~stathis/blog/precompiled-openssl/
| * | | | Merge branch 'vs-rc-defines' into releaseBrad King2017-04-101-0/+4
| |\ \ \ \
* | \ \ \ \ Merge topic 'findmpi-add-imported-targets'Brad King2017-04-191-0/+29
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3ed9f635 FindMPI: Add test case 86979bb5 FindMPI: Add IMPORTED targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !707
| * | | | | FindMPI: Add IMPORTED targetsChristian Pfeiffer2017-04-151-0/+29
| | |_|_|/ | |/| | |
* | | | | Merge topic 'tcc-enable_exports'Brad King2017-04-181-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 11ab003b TinyCC: Support ENABLE_EXPORT property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !711
| * | | | | TinyCC: Support ENABLE_EXPORT propertyhsc2017-04-171-0/+1
| | | | | | | | | | | | | | | | | | Replace the default -Wl,--export-dynamic with -rdynamic.
* | | | | | Merge topic 'cpackifw-search-algorithm'Brad King2017-04-181-6/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 049be8b9 CPackIFW: Added new QtIFW versions for search d97978b8 CPackIFW: Improved QtIFW search algorithm Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !674
| * | | | | | CPackIFW: Added new QtIFW versions for searchKonstantin Podsvirov2017-04-151-0/+5
| | | | | | |
| * | | | | | CPackIFW: Improved QtIFW search algorithmKonstantin Podsvirov2017-04-151-6/+42
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Improvements: - Added new hint CPACK_IFW_ROOT variable; - Extend documentation.
* | | | | | Merge topic 'findmpi-mark-library-advanced'Brad King2017-04-181-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | d9d280f5 FindMPI: Mark old MPI library entries as advanced Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !708
| * | | | | FindMPI: Mark old MPI library entries as advancedChristian Pfeiffer2017-04-151-0/+1
| |/ / / /
* | | | | Merge topic 'vs-custom-kits-dir'Brad King2017-04-171-0/+6
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | fee01194 VS: Add an environment variable for the Windows 10 kits directory b80c6d12 VS: Refactor Win 10 Kits root detection to support multiple roots Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !696
| * | | | VS: Add an environment variable for the Windows 10 kits directoryBrad King2017-04-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define a `CMAKE_WINDOWS_KITS_10_DIR` environment variable to allow users to tell CMake about a custom Windows 10 SDK directory. We choose to make this an environment variable rather than a CMake variable or cache entry because: * Using a custom directory also requires custom external MSBuild configuration. Therefore users are already configuring a custom environment. * The custom directory must be set consistently in all parts of a build including nested projects. An environment variable avoids requiring users to thread the setting into nested builds. Fixes: #16743
* | | | | Merge topic 'CheckSymbolExists-update-docs'Brad King2017-04-131-32/+41
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7f8b93ab CheckSymbolExists: Document that intrinsics may not be detected 91233d56 CheckSymbolExists: Format documentation b416d3e6 CheckSymbolExists: Convert docs to bracket comment syntax Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !695
| * | | | | CheckSymbolExists: Document that intrinsics may not be detectedBrad King2017-04-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16794
| * | | | | CheckSymbolExists: Format documentationBrad King2017-04-121-18/+26
| | | | | |
| * | | | | CheckSymbolExists: Convert docs to bracket comment syntaxBrad King2017-04-121-32/+33
| |/ / / /
* | | | | Merge topic 'project-description'Brad King2017-04-131-3/+13
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 3b484871 project: Add `DESCRIPTION` parameter Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !679
| * | | | project: Add `DESCRIPTION` parameterAlex Turbov2017-04-111-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is quite often the project description has used in a real world software. Examples include: * part of a help screen of the application * builtin resources (`*.rc` files, data for "About" dialog of a GUI app, & etc) * most generators for CPack can use it * it could be used by documentary software (Doxygen, Sphinx) which is usually integrated to CMake based projects via `add_custom_target()` Now `project()` call learned an optional `DESCRIPTION` parameter with a short string describing a project. Being specified, it would set the `PROJECT_DESCRIPTION` variable which could be used in `configure_file()` or whatever user wants. Also `PROJECT_DESCRIPTION` is a default value for `CPACK_PACKAGE_DESCRIPTION_SUMMARY`.
* | | | | Merge topic 'macos-hidpi-qt-dialog'Brad King2017-04-121-0/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | d9140305 macOS: Enable Hi-DPI support in applications by default Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !682
| * | | | macOS: Enable Hi-DPI support in applications by defaultĽubomír Carik2017-04-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every desktop application should be HiDPI ready in present. Based on information from Qt documentation enabling properties in `Info.plist` is sufficient to activate this feature. Newer versions of `qmake` do it. Signed-off-by: Ľubomír Carik <Lubomir.Carik@gmail.com>
* | | | | Merge topic 'FindPythonInterp-3.6-windows'Brad King2017-04-111-2/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 9d15d3c7 FindPythonInterp: Add `-32` and `-64` registry entry variants Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !675
| * | | | FindPythonInterp: Add `-32` and `-64` registry entry variantsRobert Dailey2017-04-101-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of 3.6.1 Python (only version tested in this case), installing 32-bit version on 64-bit windows has a slightly different registry key path. `-32` is appended to the end of the version number in the path. Also added a few more registry path guesses based on 64-bit version of Python. Also the module now checks if the host is WIN32 instead of the target, which is required if you are cross compiling.
* | | | | Merge topic 'vs-rc-defines'Brad King2017-04-101-0/+4
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 89b92a98 RC: Mark CMAKE_RC_FLAGS_<CONFIG> cache entries as advanced Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !685
| * | | | RC: Mark CMAKE_RC_FLAGS_<CONFIG> cache entries as advancedBrad King2017-04-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were added by commit v3.8.0-rc4~4^2~1 (RC: Add missing CMAKE_RC_FLAGS_<CONFIG> entries to cache, 2017-03-28) and should be advanced as they are for other languages.
* | | | | Merge topic 'FindwxWidgets-new-syslibs'Brad King2017-04-101-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | | | | | | | | ae4b3b70 FindwxWidgets: link with the new required libs under MSW Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !676
| * | | FindwxWidgets: link with the new required libs under MSWVadim Zeitlin2017-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Latest wxWidgets git master version and the upcoming 3.1.1 release requires linking with shlwapi and version DLLs. As this does no harm when using the previous versions, just do it unconditionally.
| * | | Merge branch 'mac-implicit-link-no-lto-flag' into releaseBrad King2017-04-031-1/+9
| |\ \ \
| * \ \ \ Merge branch 'intel-compile-features' into releaseBrad King2017-03-311-1/+3
| |\ \ \ \
* | \ \ \ \ Merge topic 'multi-config-no-build-type'Brad King2017-04-073-6/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8187b884 Do not initialize CMAKE_BUILD_TYPE on multi-config generators Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !666
| * | | | | | Do not initialize CMAKE_BUILD_TYPE on multi-config generatorsBastien Schatt2017-04-063-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the `GENERATOR_IS_MULTI_CONFIG` global property to reliably detect multi-config generators regardless of what variables the project or user have set.
* | | | | | | FindBoost: Fix release name candidate list constructionyume todo2017-04-061-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in commit 3ca6f70f (FindBoost: Allow testing for multiple compiler suffixes, 2017-03-28) accidentally left a `set()` instead of a `list(APPEND)` while constructing `_boost_RELEASE_NAMES`. Fix the logic to match what was done for `_boost_DEBUG_NAMES`. Otherwise we drop some of the candidate names.
* | | | | | Merge topic 'cpack-wix-root'Brad King2017-04-051-15/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fde8dfa4 CPackWIX: Add documentation for CPACK_WIX_ROOT fb22ba63 CPackWIX: Fix variable documentation indentations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !665
| * | | | | | CPackWIX: Add documentation for CPACK_WIX_ROOTNils Gladitz2017-04-041-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16774
| * | | | | | CPackWIX: Fix variable documentation indentationsNils Gladitz2017-04-041-15/+15
| | | | | | |
* | | | | | | Merge topic 'revert-cpack_nsis_sign_uninstaller'Brad King2017-04-052-49/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b1ad2a2 Revert "CPack/NSIS: Sign the uninstaller" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !597
| * | | | | | | Revert "CPack/NSIS: Sign the uninstaller"Brad King2017-04-042-49/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 09475c29 (CPack/NSIS: Sign the uninstaller, 2017-03-01) and follow-up commit e1ee7b43 (CPack/NSIS: Avoid a race condition when generating the installer, 2017-03-22). The signing implementation does not work on Linux for a couple reasons: * The script tries to run the temporary uninstaller executable, but of course this cannot be done except on a Windows host. * The `${NSISDIR}\makensis` file does not exist because `makensis` is installed elsewhere. The result is that existing package configurations can break on Linux. For example, the CPackComponents test fails. Revert the feature until an alternative implementation approach can be found.
* | | | | | | Merge topic 'FindCUDA-tll-keywords'Brad King2017-04-051-7/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f41bfd7 FindCUDA: Add option to use modern form of target_link_libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !663
| * | | | | | | FindCUDA: Add option to use modern form of target_link_librariesTaylor Braun-Jones2017-04-041-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the option CUDA_LINK_LIBRARIES_KEYWORD which can be set to PRIVATE, PUBLIC, or INTERFACE or left empty (the default) to use the old form of target_link_libraries internally in FindCUDA macros. Fixes: #16772
* | | | | | | | Merge topic 'CheckIPOSupported-Fortran'Brad King2017-04-054-7/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87199ea6 CheckIPOSupported: Add Fortran support c92fd256 CheckIPOSupported: Move '_CMakeLTOTest-*' under 'CMakeFiles' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !655
| * | | | | | | | CheckIPOSupported: Add Fortran supportRuslan Baratov2017-04-044-6/+16
| | | | | | | | |