summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* CPackIFW: Refactor and revise this generatorKonstantin Podsvirov2014-08-111-3/+15
| | | | | | | | | | | | | Split the monolithic cmCPackIFWGenerator source into three parts: cmCPackIFWGenerator, cmCPackIFWInstaller, and cmCPackIFWPackage to isolate the implementations somewhat. Add a COMMON option to the cpack_ifw_configure_component command to make the data component common to its parent group. Change the default packaging method to ONE_PACKAGE_PER_COMPONENT. This is not incompatible because the CPack IFW generator has not yet been in a release.
* Merge topic 'cpack-options-sort'Brad King2014-08-041-25/+42
|\ | | | | | | | | | | 58f3d96d CPack: Sort packaging options lexicographically efb45007 CPack: Expand mark_as_advanced arguments to one-per-line
| * CPack: Sort packaging options lexicographicallyBrad King2014-07-311-27/+27
| | | | | | | | This will allow new options to be added more cleanly.
| * CPack: Expand mark_as_advanced arguments to one-per-lineBrad King2014-07-311-9/+26
| | | | | | | | This will allow new values to be added without editing existing lines.
* | Merge topic 'fix-check-module-DEFINED-tests'Brad King2014-08-0411-11/+11
|\ \ | | | | | | | | | | | | 4f2fcce4 Check*: Allow result variables to contain regex special characters (#14923)
| * | Check*: Allow result variables to contain regex special characters (#14923)Brad King2014-07-3111-11/+11
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to the existence of the if(DEFINED) condition, many of our Check modules implemented the condition with a hack that takes advantage of the auto-dereference behavior of the if() command to detect if a variable is defined. The hack has the form: if("${VAR} MATCHES "^${VAR}$") where "${VAR}" is a macro argument reference. However, this does not work when the variable named in the macro argument contains characters that have special meaning in regular expressions, such as '+'. Run the command git grep -E 'if\("\$\{.*\}" MATCHES "\^\$\{.*\}\$"\)' -- Modules/Check* to identify lines with this problem. Use if(NOT DEFINED) instead.
* | Check*CompilerFlag: Add pattern for Fujitsu compiler (#15051)Erik Lindahl2014-07-311-0/+1
|/
* Merge topic 'cpack-mark-ifw-advanced'Brad King2014-07-311-0/+1
|\ | | | | | | | | 5cabc2cd CPack: Mark CPACK_BINARY_IFW option as advanced
| * CPack: Mark CPACK_BINARY_IFW option as advancedBrad King2014-07-301-0/+1
| | | | | | | | | | | | All similar options are already marked. Suggested-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
* | Merge topic 'cpack-add-lzma-package-options'Brad King2014-07-311-0/+10
|\ \ | |/ | | | | | | 9d93e099 CPack: Add lzma-compressed package options
| * CPack: Add lzma-compressed package optionsDaniel Pfeifer2014-07-301-0/+10
| | | | | | | | | | | | | | | | | | Add options to package binary and source tarballs: CPACK_BINARY_7Z CPACK_BINARY_TXZ CPACK_SOURCE_7Z CPACK_SOURCE_TXZ
* | Merge topic 'check-flag-avoid-semicolon'Brad King2014-07-311-1/+1
|\ \ | | | | | | | | | | | | cac91206 Check*CompilerFlag: Avoid ';' in common pattern (#15048)
| * | Check*CompilerFlag: Avoid ';' in common pattern (#15048)Brad King2014-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | In commit v3.0.0-rc1~551^2~1 (Check*CompilerFlag: make C and CXX modules share most error patterns, 2013-08-08) a pattern containing a ';' was moved out of a ""-quoted argument and into a variable. CMake flattens the containing list and breaks the pattern. Use a '.' to match ';'.
* | | Merge topic 'cpack-ifw-generator'Brad King2014-07-311-4/+39
|\ \ \ | | | | | | | | | | | | | | | | | | | | e7511b7f CPackIFW: Add package configuration variables b2340001 CPackIFW: Document cpack_ifw_configure_component DEPENDS option
| * | | CPackIFW: Add package configuration variablesKonstantin Podsvirov2014-07-291-4/+36
| | | |
| * | | CPackIFW: Document cpack_ifw_configure_component DEPENDS optionKonstantin Podsvirov2014-07-291-0/+3
| | | |
* | | | Merge topic 'pdb-genex'Brad King2014-07-311-0/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | f86850ef Genex: Implement generator expressions for target PDB files. 028ad318 Genex: Simplify filesytem artifact code
| * | | Genex: Implement generator expressions for target PDB files.Nils Gladitz2014-07-311-0/+1
| | | |
* | | | Merge topic 'remove-link-remnants'Brad King2014-07-301-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 250ad08a Ninja: Remove _COMPILER_LINKER_OPTION_FLAG_ remnants
| * | | | Ninja: Remove _COMPILER_LINKER_OPTION_FLAG_ remnantsNils Gladitz2014-07-291-1/+0
| |/ / /
* | | | ExternalProject: Recognize lzma-compressed files (#13515)Brad King2014-07-291-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add .7z, .tar.xz, and .txz file extensions. Inspired-by: Joke de Buhr <joke@seiken.de> Inspired-by: David Cole <DLRdave@aol.com>
* | | | ExternalProject: Recognize .tbz2 extensionBrad King2014-07-291-5/+5
| |/ / |/| | | | | | | | | | | | | | | | | | | | Also fix .bz2 extension to be .tar.bz2 since we only support compressed tarballs and not plain compressed files. Suggested-by: Nils Gladitz <nilsgladitz@gmail.com> Suggested-by: Rolf Eike Beer <eike@sf-mail.de>
* | | Merge topic 'windows-ce-cleanup'Brad King2014-07-293-5/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7079f33d WindowsCE: Drop unused Platform/WindowsCE-MSVC module 05373f7e WindowsCE: Refactor setting of "WINCE" 1acde6b0 MSVC: Use STREQUAL to check for WindowsCE
| * | | WindowsCE: Drop unused Platform/WindowsCE-MSVC moduleBrad King2014-07-281-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This module was created to mirror Platform/Windows-MSVC.cmake, but this is not necessary because nothing includes "Platform/<os>-<id>.cmake" directly. The Platform/Windows-MSVC module is only a helper for the Platform/Windows-MSVC-<lang> modules.
| * | | WindowsCE: Refactor setting of "WINCE"Brad King2014-07-282-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Move it to the Platform/Windows module since it is independent of the compiler used. While at it, remove redundant "WIN32" setting from Platform/Windows-MSVC since Plaform/Windows already sets its.
| * | | MSVC: Use STREQUAL to check for WindowsCEBrad King2014-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | In the Platform/Windows-MSVC module it is not necessary to use MATCHES because we are comparing against an exact string.
* | | | Merge topic 'osx-no-sysroot-for-deployment'Brad King2014-07-291-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 5b4faeef OS X: Allow deployment target with "/" sysroot (#15040)
| * | | | OS X: Allow deployment target with "/" sysroot (#15040)Jeremy Huddleston2014-07-281-0/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Allow the combination -DCMAKE_OSX_DEPLOYMENT_TARGET="10.8" -DCMAKE_OSX_SYSROOT="/" to work. Treat the "/" sysroot as targeting the current OS X version.
* | | | Merge topic 'FindQt4-more-plugins'Brad King2014-07-291-3/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | 4b5052b0 FindQt4: Add nativewifi and qtga plugins
| * | | FindQt4: Add nativewifi and qtga pluginsMathieu MARACHE2014-07-281-3/+3
| | |/ | |/| | | | | | | | | | While at it, update QT_QTGUI_PLUGINS to use QT_IMAGEFORMATS_PLUGINS instead of duplicating the list.
* | | Merge topic 'fix-re-cmake-with-compiler'Brad King2014-07-281-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | 8981513a CMakeDetermineCompiler: Simplify CMAKE_<LANG>_COMPILER default force-cache 731427a6 cmGlobalGenerator: Do not re-add CMAKE_<LANG>_COMPILER
| * | | CMakeDetermineCompiler: Simplify CMAKE_<LANG>_COMPILER default force-cacheBrad King2014-07-241-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | If find_program does not find CMAKE_<LANG>_COMPILER, use set_property() to force the value to be that of CMAKE_<LANG>_COMPILER_INIT instead of set(). This allows us to set the value without re-specifying the type and documentation, thus preserving what find_program set.
* | | Merge topic 'cpack-ifw-generator'Brad King2014-07-283-0/+389
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b9be4d21 Help: Add notes for topic 'cpack-ifw-generator' 73b336c9 CPackIFW: Replace use of strftime with cmTimestamp 44850a26 CPack: Add an "IFW" generator for Qt Framework Installer
| * | | CPack: Add an "IFW" generator for Qt Framework InstallerKonstantin Podsvirov2014-07-283-0/+389
| |/ / | | | | | | | | | | | | | | | | | | | | | Add support for packaging with the Qt Framework Installer tools: http://qt-project.org/doc/qtinstallerframework/index.html Reviewed-by: Nils Gladitz <nilsgladitz@gmail.com>
* | | FindImageMagick: Provide per-component include dirs (#15007)Brad King2014-07-231-2/+9
| | | | | | | | | | | | | | | Set the ImageMagick_<component>_INCLUDE_DIRS variable that is mentioned in the documentation but was not set before.
* | | FindImageMagick: Find arch include dir (#15007)bastien ROUCARIES2014-07-231-1/+18
|/ /
* | Merge topic 'fix-QCC-compile-flags'Brad King2014-07-216-27/+41
|\ \ | | | | | | | | | | | | 3151024d QNX: Add missing flags for configurations and artifact creation.
| * | QNX: Add missing flags for configurations and artifact creation.Stephen Kelly2014-07-176-27/+41
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit v3.0.0-rc1~111^2 (QNX: Introduce QCC compiler id for that QNX platform compiler., 2014-01-20) split handling of the QNX QCC compiler into a separate compiler-id. That refactoring results in the QCC compiler not using the CMake-compiler-id "GNU", which means that the __compiler_gnu macro is no longer executed for it. Add Compiler/QCC*.cmake modules to define and call the __compiler_qcc macro and teach it to call __compiler_gnu internally. Remove the corresponding pieces from the Platform/QNX*.cmake modules. It is also necessary to change the language conditional to dereference the lang macro parameter, which is another bug introduced by the same commit. The extra -lang-c++ flag is only necessary when the CXX compiler is specified as 'qcc' instead of 'QCC' in the toolchain file, which is why this bug was not noticed before. The flag is also necessary in that case when linking in order to find the appropriate standard libraries. The flag was not previously added when linking executables, so linking failed even with CMake 2.8.12 with the lower-case compiler-id. Co-Author: Brad King <brad.king@kitware.com>
* | CTest: Fix MemoryCheckType from 'ctest -T MemCheck'Bill Hoffman2014-07-161-0/+1
| | | | | | | | | | | | Before this commit, you would have to run ctest -S mode to get MemoryCheckType to work. This is because CMAKE_COMMAND was not set. The fix is to use cmSystemTools::GetCMakeCommand instead.
* | Merge topic 'FindCurses-overhaul'Brad King2014-07-151-79/+98
|\ \ | | | | | | | | | | | | 6c8364e6 FindCurses: Overhaul Curses and NCurses search logic (#15011)
| * | FindCurses: Overhaul Curses and NCurses search logic (#15011)Brad King2014-07-141-79/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Produce a more consistent result by finding only a single include directory and reporting which headers may be included from it. The previous search for each header separately might find pieces from separate and incompatible packages. While at it, provide the CURSES_INCLUDE_DIRS result variable to be consistent with other modules.
* | | FindImageMagick: Use pkgconfig hints if available (#14012)Rex Dieter2014-07-141-0/+10
|/ / | | | | | | Tested-by: bastien ROUCARIES <roucaries.bastien@gmail.com>
* | Merge topic 'FindCurses-blank-at-eof'Brad King2014-07-141-1/+0
|\ \ | | | | | | | | | | | | ccf2fca1 FindCurses: Remove blank line at end of file
| * | FindCurses: Remove blank line at end of fileBrad King2014-07-141-1/+0
| | |
* | | Merge topic 'wince-fix-dll-linking'Brad King2014-07-141-4/+6
|\ \ \ | |/ / |/| | | | | | | | 7e1283e4 MSVC: Fix linking of DLLs on WinCE (#15013)
| * | MSVC: Fix linking of DLLs on WinCE (#15013)Brad King2014-07-101-4/+6
| |/ | | | | | | | | | | | | | | On WinCE we must link both shared libraries and executables with the /subsystem:windowsce flag. Teach Platform/Windows-MSVC to pass it to the linker in both cases. Suggested-by: Gunnar Roth <gunnar.roth@gmx.de>
* | Merge topic 'FindSWIG-swig3.0'Brad King2014-07-091-1/+2
|\ \ | | | | | | | | | | | | 7400695e FindSWIG: Add support for swig 3.0 application
| * | FindSWIG: Add support for swig 3.0 applicationSylvain Joubert2014-07-071-1/+2
| | |
* | | Merge topic 'CMakeExpandImportedTargets-CMP0045'Brad King2014-07-091-2/+10
|\ \ \ | |/ / |/| | | | | | | | 49f32168 CMakeExpandImportedTargets: Do not read property on non-target (#15008)
| * | CMakeExpandImportedTargets: Do not read property on non-target (#15008)Brad King2014-07-071-2/+10
| |/ | | | | | | | | Avoid behavior that is disallowed by CMP0045. Check whether a target exists before trying to read its properties.
generated by cgit v0.12 at 2025-01-07 16:31:11 (GMT)