kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
28,085 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

5828 Commits

Author SHA1 Message Date
Brad King 00ccfff2bc Merge topic 'cpack-ifw-updates' 
342d15cb Update packaging of CMake for QtIFW 2.0
9a0ba4d2 CPackIFW: Add QtIFW 2.0 support
 2015-05-18 09:56:17 -04:00
Raffi Enficiaud efab80501e CPack/DEB: reworked documentation 2015-05-15 23:07:49 +02:00
Brad King 1911cb2173 Merge topic 'FindSquish-sh-exit' 
12b85b17 FindSquish: Avoid bash-specific behavior in test script (#15568)
 2015-05-15 11:22:26 -04:00
Konstantin Podsvirov 9a0ba4d24a CPackIFW: Add QtIFW 2.0 support 
Add variables:

- CPACK_IFW_FRAMEWORK_VERSION
- CPACK_IFW_PACKAGE_ALLOW_NON_ASCII_CHARACTERS
- CPACK_IFW_PACKAGE_ALLOW_SPACE_IN_PATH
- CPACK_IFW_PACKAGE_CONTROL_SCRIPT
- CPACK_IFW_PACKAGE_MAINTENANCE_TOOL_INI_FILE
- CPACK_IFW_PACKAGE_MAINTENANCE_TOOL_NAME
- CPACK_IFW_PACKAGE_START_MENU_DIRECTORY
- CPACK_IFW_VERBOSE
 2015-05-15 11:02:49 -04:00
Brad King a86ddbe56e Merge topic 'FindHDF5-version-support' 
56858178 FindHDF5: Add version support
4bd122ad FindHDF5: Check for a few H5pubconf*.h name variants
 2015-05-14 10:27:42 -04:00
Felix Geyer 12b85b1791 FindSquish: Avoid bash-specific behavior in test script (#15568) 
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.
 2015-05-14 08:53:33 -04:00
Axel Huebl 5685817874 FindHDF5: Add version support 
Detect the HDF5 version and set HDF5_VERSION just as we
detect HDF5_IS_PARALLEL from the header already.
 2015-05-13 10:00:55 -04:00
Brad King 4bd122ad9c FindHDF5: Check for a few H5pubconf*.h name variants 
Some distros package H5pubconf.h as "H5pubconf-32.h" or "H5pubconf-64.h"
depending on the architecture.  Look for all of these names.
 2015-05-13 09:59:43 -04:00
Felix Geyer 7953867ba4 FindJava: Fix OpenJDK 8 version detection (#15565) 
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.
 2015-05-12 13:46:12 -04:00
Brad King 70d48e1287 Merge topic 'cpack-deb-component-dependencies' 
1237d5fa Help: Add notes for topic 'cpack-deb-component-dependencies'
e3f522f6 CPack/DEB per component dependencies
 2015-05-12 09:12:54 -04:00
Brad King a5bab6e1a4 Merge topic 'cpack-not-running-tests' 
7c103be8 CPack: Enable DEB and RPM tests more reliably
 2015-05-12 09:12:52 -04:00
Brad King ffd5d09225 Merge topic 'find_package-no-cmake-gui-paths' 
1506f9ca find_package: Drop search in recent cmake-gui locations
8d484463 FindFLTK: Drop search in recent cmake-gui locations
 2015-05-12 09:12:50 -04:00
Brad King 55fe56444f Merge topic 'ExternalProject-improve-missing-source-error' 
dcb18836 ExternalProject: Improve error when SOURCE_DIR is missing (#15560)
 2015-05-12 09:12:43 -04:00
Brad King cca3bbde98 Merge topic 'ninja-gcc-windows' 
cf8ce7a3 RC: Do not override MinGW Makefiles generator preference
ca658a45 Ninja: Use forward slashes for linking with any GCC on Windows (#15439)
 2015-05-12 09:12:41 -04:00
Domen Vrankar 7c103be8de CPack: Enable DEB and RPM tests more reliably 
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.
 2015-05-12 08:56:34 -04:00
Brad King cf8ce7a39e RC: Do not override MinGW Makefiles generator preference 
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.
 2015-05-11 09:00:25 -04:00
Raffi Enficiaud e3f522f6e4 CPack/DEB per component dependencies 
Dependencies may now be set per component
 2015-05-08 23:36:26 +02:00
Brad King 8d48446372 FindFLTK: Drop search in recent cmake-gui locations 
This is not done by any other find modules.
 2015-05-08 11:26:56 -04:00
Brad King 715b3edf7d Merge topic 'WCDH-CMP0054-safety' 
65e6b115 WCDH: Fix condition when variables named "FILE" or "PREFIX" are defined
 2015-05-08 09:41:22 -04:00
Brad King e38a2b5953 Merge topic 'ninja-gcc-windows' 
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
 2015-05-08 09:41:20 -04:00
Brad King dcb188363d ExternalProject: Improve error when SOURCE_DIR is missing (#15560) 
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.
 2015-05-08 09:20:43 -04:00
Brad King 8102417695 Merge topic 'cpack-rpm-debug-log-fix' 
1a2a73a5 CPack/RPM fix output in debug log
 2015-05-07 14:25:40 -04:00
Brad King 6b9e2f7100 Merge topic 'cpack-deb-component-auto-discovery' 
4588a169 CPack/DEB component dependency auto-discovery
 2015-05-07 14:25:31 -04:00
Raffi Enficiaud 4588a1697f CPack/DEB component dependency auto-discovery 
Dependency auto-discovery can now be set per component
 2015-05-07 14:21:57 -04:00
Brad King 957c2aac7f RC: Simplify selection of resource compiler based on C/C++ toolchain 
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.
 2015-05-07 11:43:02 -04:00
Brad King 65e6b1152f WCDH: Fix condition when variables named "FILE" or "PREFIX" are defined 
Reported-by: Kevin Godby <godbyk@gmail.com>
 2015-05-07 09:00:45 -04:00
Brad King b492a17611 Merge topic 'hp-gnu-asm' 
f4734270 HP-UX: Add GNU compiler information for ASM language
 2015-05-05 09:35:28 -04:00
Brad King 2d02986b7c Merge topic 'InstallRequiredSystemLibraries-vs2015' 
9b2778d4 InstallRequiredSystemLibraries: Update for VS 2015 (#15552)
 2015-05-05 09:35:25 -04:00
Thomas Orozco 1a2a73a518 CPack/RPM fix output in debug log 
output RPMBUILDOUT when intended
 2015-05-05 07:47:10 +02:00
Brad King 9b2778d412 InstallRequiredSystemLibraries: Update for VS 2015 (#15552) 
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
 2015-05-04 12:36:12 -04:00
Brad King 0f927b440a FindGTest: Fix parsing of test macro calls with spaces (#15553) 
Tolerate spaces before the open paren and after the test name before the
comma.
 2015-05-04 11:28:50 -04:00
Brad King f47342701c HP-UX: Add GNU compiler information for ASM language 
Suggested-by: Gerhard Grimm <gerhard.grimm@detec.com>
 2015-05-04 11:06:16 -04:00
Brad King 088d27c38b Merge topic 'FindwxWidgets-versioned-executable' 
1b04561e FindwxWidgets: Search for wx-config-3.0 in addition to wx-config (#15540)
 2015-04-30 10:32:13 -04:00
Brad King 1c3158558c Merge topic 'cpack-deb-component-description' 
2f0afffa CPackDEB component description
 2015-04-30 10:32:06 -04:00
Brad King b39929ab42 Merge topic 'revert-CMP0057' 
32a2f414 Revert "add_custom_command: Diagnose MAIN_DEPENDENCY limitation."
 2015-04-30 10:32:01 -04:00
Nils Gladitz 32a2f41402 Revert "add_custom_command: Diagnose MAIN_DEPENDENCY limitation." 
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.
 2015-04-30 10:20:20 -04:00
Felix Geyer 4e70fa5cbf CPack: Fix typo in CPACK_INSTALL_CMAKE_PROJECTS docs (#15543) 2015-04-29 15:21:07 -04:00
Orion Poplawski 1b04561edb FindwxWidgets: Search for wx-config-3.0 in addition to wx-config (#15540) 
The Fedora package installs 'wx-config' as 'wx-config-3.0' so look
for the latter name too.
 2015-04-29 12:51:07 -04:00
Raffi Enficiaud 2f0afffabd CPackDEB component description 
Support for setting different description
for each component.
 2015-04-29 18:05:36 +02:00
Brad King 70d54b03fd Merge topic 'InstallRequiredSystemLibraries-fix-mbcs' 
ff183986 InstallRequiredSystemLibraries: Fix MBCS MFC detection (#15531)
 2015-04-28 13:55:52 -04:00
Brad King 7244e8452f ctest: Consolidate documentation of CTEST_USE_LAUNCHERS (#15533) 
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).
 2015-04-28 13:32:23 -04:00
Brad King f693c136f9 Modules/CTest: Improve documentation formatting 
Use inline reStructuredText markup and add cross-references.
 2015-04-28 13:32:23 -04:00
Brad King 5cbedd6b85 Modules/CTest: Use bracket comment for documentation block 2015-04-28 13:32:23 -04:00
Bjoern Thiel ff183986df InstallRequiredSystemLibraries: Fix MBCS MFC detection (#15531) 
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.
 2015-04-27 10:09:38 -04:00
Brad King 9fd1f5494f Merge topic 'allow-empty-CMAKE_TOOLCHAIN_FILE' 
22926dd6 Allow CMAKE_TOOLCHAIN_FILE to be an empty string
 2015-04-23 09:04:41 -04:00
Brad King 46098b0676 Merge topic 'check-compiler-flag-clang' 
680ebebc Check*CompilerFlag: Add another pattern for Clang (#15526)
 2015-04-23 09:04:39 -04:00
Andrey Pokrovskiy 22926dd651 Allow CMAKE_TOOLCHAIN_FILE to be an empty string 
Do not try to include() an empty string in the generated CMakeSystem
module.
 2015-04-22 16:06:44 -04:00
Dan Kegel 680ebebc1a Check*CompilerFlag: Add another pattern for Clang (#15526) 
Match 'optimization flag ... not supported' messages.
 2015-04-22 10:59:57 -04:00
Brad King e1c6df392b ExternalProject: Allow dependencies on INTERFACE libraries 
Respect INTERFACE library property whitelist.  Check that a target has
type "UTILITY" before querying other properties.
 2015-04-22 08:48:52 -04:00
Brad King c0502faa4b ExternalProject: Fix error message typo 2015-04-21 11:32:13 -04:00