summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindSquish-sh-exit'Brad King2015-05-151-2/+2
|\ | | | | | | | | 12b85b17 FindSquish: Avoid bash-specific behavior in test script (#15568)
| * FindSquish: Avoid bash-specific behavior in test script (#15568)Felix Geyer2015-05-141-2/+2
| | | | | | | | | | | | | | Fix Squish4RunTestCase.sh to be POSIX compliant by exiting with 255 explicitly instead of depending on bash to translate -1 to 255. This script is used by the SQUISH_V3_ADD_TEST and SQUISH_V4_ADD_TEST macros provided by FindSquish.
* | Merge topic 'FindHDF5-version-support'Brad King2015-05-141-5/+20
|\ \ | | | | | | | | | | | | | | | 56858178 FindHDF5: Add version support 4bd122ad FindHDF5: Check for a few H5pubconf*.h name variants
| * | FindHDF5: Add version supportAxel Huebl2015-05-131-3/+16
| | | | | | | | | | | | | | | Detect the HDF5 version and set HDF5_VERSION just as we detect HDF5_IS_PARALLEL from the header already.
| * | FindHDF5: Check for a few H5pubconf*.h name variantsBrad King2015-05-131-2/+4
| |/ | | | | | | | | Some distros package H5pubconf.h as "H5pubconf-32.h" or "H5pubconf-64.h" depending on the architecture. Look for all of these names.
* | FindJava: Fix OpenJDK 8 version detection (#15565)Felix Geyer2015-05-121-1/+1
|/ | | | | | The openjdk-8 (8u45-b14-2) package on Debian unstable has extra text after the version number components. Match this and add it to the reported version string.
* Merge topic 'cpack-deb-component-dependencies'Brad King2015-05-121-15/+53
|\ | | | | | | | | | | 1237d5fa Help: Add notes for topic 'cpack-deb-component-dependencies' e3f522f6 CPack/DEB per component dependencies
| * CPack/DEB per component dependenciesRaffi Enficiaud2015-05-081-15/+53
| | | | | | | | Dependencies may now be set per component
* | Merge topic 'cpack-not-running-tests'Brad King2015-05-121-4/+3
|\ \ | | | | | | | | | | | | 7c103be8 CPack: Enable DEB and RPM tests more reliably
| * | CPack: Enable DEB and RPM tests more reliablyDomen Vrankar2015-05-121-4/+3
| |/ | | | | | | | | | | | | CPack DEB and RPM generators were not used for some tests because CPACK_BINARY_DEB and CPACK_BINARY_RPM variable were not set. Fix this, simplify generator selection in CTEST_RUN_CPackComponentsForAll, and fix bugs that were detected after tests were run.
* | Merge topic 'find_package-no-cmake-gui-paths'Brad King2015-05-122-28/+0
|\ \ | | | | | | | | | | | | | | | 1506f9ca find_package: Drop search in recent cmake-gui locations 8d484463 FindFLTK: Drop search in recent cmake-gui locations
| * | FindFLTK: Drop search in recent cmake-gui locationsBrad King2015-05-082-28/+0
| | | | | | | | | | | | This is not done by any other find modules.
* | | Merge topic 'ExternalProject-improve-missing-source-error'Brad King2015-05-121-1/+12
|\ \ \ | | | | | | | | | | | | | | | | dcb18836 ExternalProject: Improve error when SOURCE_DIR is missing (#15560)
| * | | ExternalProject: Improve error when SOURCE_DIR is missing (#15560)Brad King2015-05-081-1/+12
| |/ / | | | | | | | | | | | | Mention the SOURCE_DIR that we checked and found empty or missing so that the user can see the full path to what we expected to find.
* | | Merge topic 'ninja-gcc-windows'Brad King2015-05-121-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | cf8ce7a3 RC: Do not override MinGW Makefiles generator preference ca658a45 Ninja: Use forward slashes for linking with any GCC on Windows (#15439)
| * | RC: Do not override MinGW Makefiles generator preferenceBrad King2015-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Update logic added in commit 957c2aac (RC: Simplify selection of resource compiler based on C/C++ toolchain, 2015-05-07) to avoid overriding CMAKE_GENERATOR_RC. The MinGW and MSYS Makefiles generators use it to select a windres next to the compiler even if it is not in the PATH.
* | | Merge topic 'WCDH-CMP0054-safety'Brad King2015-05-081-2/+2
|\ \ \ | | | | | | | | | | | | | | | | 65e6b115 WCDH: Fix condition when variables named "FILE" or "PREFIX" are defined
| * | | WCDH: Fix condition when variables named "FILE" or "PREFIX" are definedBrad King2015-05-071-2/+2
| | | | | | | | | | | | | | | | Reported-by: Kevin Godby <godbyk@gmail.com>
* | | | Merge topic 'ninja-gcc-windows'Brad King2015-05-083-0/+11
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | | | | | | | | | 20560e8d Ninja: Do not use newlines in response files with Windows GNU tools (#15439) b3de0dfe Ninja: Use forward slashes for any GCC on Windows (#15439) 378c2a0e Ninja: Refactor detection of MinGW tools on Windows 957c2aac RC: Simplify selection of resource compiler based on C/C++ toolchain
| * | RC: Simplify selection of resource compiler based on C/C++ toolchainBrad King2015-05-073-0/+11
| |/ | | | | | | | | | | | | | | | | | | Revert the refactoring by commit v2.8.11~105^2~1 (Ninja: use MinGW generator code in EnableLanguage, 2013-03-09) and move the MinGW- specific logic back to the "MinGW Makefiles" generator. Instead teach the platform information modules for GNU and MSVC on Windows to set the preferred RC compiler just before enabling the RC language. This way we choose the RC compiler based on the C/C++ toolchain that is actually enabled.
* | Merge topic 'cpack-rpm-debug-log-fix'Brad King2015-05-071-1/+1
|\ \ | | | | | | | | | | | | 1a2a73a5 CPack/RPM fix output in debug log
| * | CPack/RPM fix output in debug logThomas Orozco2015-05-051-1/+1
| | | | | | | | | | | | output RPMBUILDOUT when intended
* | | Merge topic 'cpack-deb-component-auto-discovery'Brad King2015-05-071-63/+111
|\ \ \ | |_|/ |/| | | | | | | | 4588a169 CPack/DEB component dependency auto-discovery
| * | CPack/DEB component dependency auto-discoveryRaffi Enficiaud2015-05-071-63/+111
| |/ | | | | | | Dependency auto-discovery can now be set per component
* | Merge topic 'hp-gnu-asm'Brad King2015-05-051-0/+2
|\ \ | | | | | | | | | | | | f4734270 HP-UX: Add GNU compiler information for ASM language
| * | HP-UX: Add GNU compiler information for ASM languageBrad King2015-05-041-0/+2
| |/ | | | | | | Suggested-by: Gerhard Grimm <gerhard.grimm@detec.com>
* | Merge topic 'InstallRequiredSystemLibraries-vs2015'Brad King2015-05-051-2/+10
|\ \ | | | | | | | | | | | | 9b2778d4 InstallRequiredSystemLibraries: Update for VS 2015 (#15552)
| * | InstallRequiredSystemLibraries: Update for VS 2015 (#15552)Brad King2015-05-041-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | The part of the MS C Runtime library that applications need to distribute has been renamed from "msvcr*.dll" to "vcruntime*.dll" starting with VS 2015. See the Visual C++ Team Blog: Introducing the Universal CRT http://blogs.msdn.com/b/vcblog/archive/2015/03/03/introducing-the-universal-crt.aspx
* | | FindGTest: Fix parsing of test macro calls with spaces (#15553)Brad King2015-05-041-2/+2
| |/ |/| | | | | | | Tolerate spaces before the open paren and after the test name before the comma.
* | Merge topic 'FindwxWidgets-versioned-executable'Brad King2015-04-301-1/+1
|\ \ | | | | | | | | | | | | 1b04561e FindwxWidgets: Search for wx-config-3.0 in addition to wx-config (#15540)
| * | FindwxWidgets: Search for wx-config-3.0 in addition to wx-config (#15540)Orion Poplawski2015-04-291-1/+1
| | | | | | | | | | | | | | | The Fedora package installs 'wx-config' as 'wx-config-3.0' so look for the latter name too.
* | | Merge topic 'cpack-deb-component-description'Brad King2015-04-301-8/+33
|\ \ \ | | | | | | | | | | | | | | | | 2f0afffa CPackDEB component description
| * | | CPackDEB component descriptionRaffi Enficiaud2015-04-291-8/+33
| |/ / | | | | | | | | | | | | Support for setting different description for each component.
* | | Merge topic 'revert-CMP0057'Brad King2015-04-301-1/+2
|\ \ \ | | | | | | | | | | | | | | | | 32a2f414 Revert "add_custom_command: Diagnose MAIN_DEPENDENCY limitation."
| * | | Revert "add_custom_command: Diagnose MAIN_DEPENDENCY limitation."Nils Gladitz2015-04-301-1/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 242c3966 (add_custom_command: Diagnose MAIN_DEPENDENCY limitation, 2015-03-09) and the follow up commit b372a99a (UseSWIG: Do not use MAIN_DEPENDENCY on custom commands, 2015-03-26). I misdiagnosed the underlying issue that prompted creation of policy CMP0057. The actual issue surfaces when a single custom command's MAIN_DEPENDENCY is listed in more than one target; this issue will have to be addressed independently.
* | | CPack: Fix typo in CPACK_INSTALL_CMAKE_PROJECTS docs (#15543)Felix Geyer2015-04-291-1/+1
|/ /
* | Merge topic 'InstallRequiredSystemLibraries-fix-mbcs'Brad King2015-04-281-7/+2
|\ \ | | | | | | | | | | | | ff183986 InstallRequiredSystemLibraries: Fix MBCS MFC detection (#15531)
| * | InstallRequiredSystemLibraries: Fix MBCS MFC detection (#15531)Bjoern Thiel2015-04-271-7/+2
| | | | | | | | | | | | | | | | | | | | | Fix the logic added by commit v3.0.0-rc5~9^2 (InstallRequiredSystemLibraries: MBCS MFC is optional on VS 12, 2014-05-06). Do not test content of MSVC${v}_MFC_DIR until after the variable is set.
* | | ctest: Consolidate documentation of CTEST_USE_LAUNCHERS (#15533)Brad King2015-04-281-12/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation of this variable in the CTest module is outdated and has been superseded by the ctest(1) manual. In particular, the latter mentions that it works with the Ninja generator as well as makefile generators. Remove the documentation from the CTest module and replace it with a link to the main variable documentation (which already references the ctest(1) manual).
* | | Modules/CTest: Improve documentation formattingBrad King2015-04-281-34/+26
| | | | | | | | | | | | Use inline reStructuredText markup and add cross-references.
* | | Modules/CTest: Use bracket comment for documentation blockBrad King2015-04-281-65/+66
|/ /
* | Merge topic 'allow-empty-CMAKE_TOOLCHAIN_FILE'Brad King2015-04-231-1/+1
|\ \ | | | | | | | | | | | | 22926dd6 Allow CMAKE_TOOLCHAIN_FILE to be an empty string
| * | Allow CMAKE_TOOLCHAIN_FILE to be an empty stringAndrey Pokrovskiy2015-04-221-1/+1
| | | | | | | | | | | | | | | Do not try to include() an empty string in the generated CMakeSystem module.
* | | Merge topic 'check-compiler-flag-clang'Brad King2015-04-231-0/+1
|\ \ \ | |/ / |/| | | | | | | | 680ebebc Check*CompilerFlag: Add another pattern for Clang (#15526)
| * | Check*CompilerFlag: Add another pattern for Clang (#15526)Dan Kegel2015-04-221-0/+1
| | | | | | | | | | | | Match 'optimization flag ... not supported' messages.
* | | ExternalProject: Allow dependencies on INTERFACE librariesBrad King2015-04-221-4/+16
| | | | | | | | | | | | | | | Respect INTERFACE library property whitelist. Check that a target has type "UTILITY" before querying other properties.
* | | ExternalProject: Fix error message typoBrad King2015-04-211-1/+1
| | |
* | | ExternalProject: Allow generator expressions with LOG_* options (#15287)Andrey Pokrovskiy2015-04-211-4/+10
| | | | | | | | | | | | | | | | | | Use file(GENERATE) to write the logging wrapper scripts to evaluate generator expressions. Use a per-config script names in case the content varies by configuration.
* | | ExternalProject: Allow generator expressions in initial cache optionsAndrey Pokrovskiy2015-04-211-5/+6
|/ / | | | | | | | | | | Use file(GENERATE) to write the initial cache file so that we can evaluate generator expressions. Use a per-config initial cache file name in case the content varies by configuration.
* | Merge topic 'cpack-deb-component-vars-prepare'Brad King2015-04-211-196/+223
|\ \ | | | | | | | | | | | | c8375e15 CPackDeb: Refactor package variable lookup by generator