summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* CPackIFW: Revise this generatorKonstantin Podsvirov2014-08-121-16/+32
| | | | | | | | | | CPack IFW generator updates: - Group now can have script; - Root package (for monolithic or one package installers) can be configured from group. CMake updates: - Native installation (no Unspecified component).
* Merge topic 'vs-windows-sdk-desktop-arm'Brad King2014-08-123-1/+11
|\ | | | | | | | | | | | | 2b20110f MSVC: Select default standard libraries for ARM platform 2dfcf0ed VS: Fix generation of desktop applications for ARM dbb5a7ee CMakeDetermineCompilerId: Fix detection for VS ARM platform
| * MSVC: Select default standard libraries for ARM platformBrad King2014-08-121-1/+5
| | | | | | | | For Windows ARM targets, only kernel32.lib and user32.lib are standard.
| * CMakeDetermineCompilerId: Fix detection for VS ARM platformBrad King2014-08-122-0/+6
| | | | | | | | | | | | | | | | | | Add WindowsSDKDesktopARMSupport to the compiler id .vcxproj to avoid 'error MSB8022: Compiling Desktop applications for the ARM platform is not supported.' from VS. Inspired-by: Minmin Gong <minmin.gong@gmail.com> Inspired-by: Gilles Khouzam <gillesk@microsoft.com>
* | Merge topic 'vs-windows-phone-and-store'Brad King2014-08-1210-4/+38
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d3d9a22 Help: Add notes for topic 'vs-windows-phone-and-store' 401a00d9 VS: Set WindowsPhone and WindowsStore min VS version required 709cebde VS: Generate WindowsPhone and WindowsStore application types 72395ab2 VS: Add .sln "Deploy" mark for WindowsPhone and WindowsStore binaries 2074f581 MSVC: Add system libs for WindowsPhone and WindowsStore c72f0887 MSVC: Add default WindowsPhone and WindowsStore compile flags 1c94558a MSVC: Disable incremental linking for WindowsPhone and WindowsStore 592098e2 Define 'WINDOWS_PHONE' and 'WINDOWS_STORE' variables aa42a78f Add WindowsPhone and WindowsStore platform information modules b94ddf6c CMakeDetermineCompilerId: Recognize WindowsPhone and WindowsStore d7938bff VS: Select WindowsPhone and WindowsStore default toolsets 3abd150c VS: Save WindowsPhone and WindowsStore system internally
| * MSVC: Add system libs for WindowsPhone and WindowsStoreBrad King2014-07-311-1/+5
| | | | | | | | | | Use the libraries that are added by default by the VS 2013 IDE for Windows Phone and Windows Store projects.
| * MSVC: Add default WindowsPhone and WindowsStore compile flagsPaul Annetts2014-07-311-0/+4
| | | | | | | | Also set the list of standard libraries to empty.
| * MSVC: Disable incremental linking for WindowsPhone and WindowsStoreGilles Khouzam2014-07-311-4/+6
| | | | | | | | | | Do not add a "/INCREMENTAL" flag when using the toolchains for these systems.
| * Define 'WINDOWS_PHONE' and 'WINDOWS_STORE' variablesGilles Khouzam2014-07-311-0/+4
| | | | | | | | | | Set one of these when CMAKE_SYSTEM_NAME is "WindowsPhone" or "WindowsStore", respectively.
| * Add WindowsPhone and WindowsStore platform information modulesBrad King2014-07-316-0/+6
| | | | | | | | | | | | | | Simply include the "Windows" platform equivalents. This will allow -DCMAKE_SYSTEM_NAME=WindowsPhone or -DCMAKE_SYSTEM_NAME=WindowsStore to select variants of the Windows platform while re-using most of the platform information from "Windows".
| * CMakeDetermineCompilerId: Recognize WindowsPhone and WindowsStoreGilles Khouzam2014-07-312-0/+14
| | | | | | | | | | | | | | | | | | When CMAKE_SYSTEM_NAME is set to target one of these, add ApplicationType and ApplicationTypeRevision elements to the .vcxproj file used to identify the compiler so that the WindowsPhone or WindowsStore toolchains can work. Co-Author: Brad King <brad.king@kitware.com>
* | Add Fujitsu compiler detectionErik Lindahl2014-08-112-0/+3
| | | | | | | | | | | | The Fujitsu C/C++ compilers are the default ones for K computer. Detect both native and cross compilers by looking for the __FUJITSU preprocessor definition.
* | Merge topic 'BundleUtilities-os9-newlines'Brad King2014-08-111-0/+1
|\ \ | | | | | | | | | | | | 810f5cce BundleUtilities: Allow Info.plist files which use CR line endings
| * | BundleUtilities: Allow Info.plist files which use CR line endingsTim Blechmann2014-08-071-0/+1
| | | | | | | | | | | | | | | | | | Convert \r to our internal end-of-line character just as we do \n. Signed-off-by: Tim Blechmann <tim@klingt.org>
* | | Merge topic 'cpack-ifw-generator'Brad King2014-08-111-3/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ebe8d51b CPackIFW: Refactor and revise this generator 82382479 Doxygen: Add STRIP_FROM_PATH variable to doxyfile.in 3040ab8f Doxygen: Add CPack/IFW subdir to doxyfile.in INPUT section
| * | | 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 'CMakePackageConfigHelpers-INSTALL_PREFIX'Brad King2014-08-111-136/+157
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 704830ae Help: Add notes for topic 'CMakePackageConfigHelpers-INSTALL_PREFIX' e3007c92 CMakePackageConfigHelpers: Add unit tests for INSTALL_PREFIX option d057bf85 CMakePackageConfigHelpers: Add INSTALL_PREFIX option f3dd116c CMakePackageConfigHelpers: restructure documentation and document commands 64eca30d CMakePackageConfigHelpers: Remove unused variable
| * | | CMakePackageConfigHelpers: Add INSTALL_PREFIX optionDaniele E. Domenichelli2014-08-111-10/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option instructs configure_package_config_file to consider paths that are not absolute as relative to the INSTALL_PREFIX directory instead of relative to the CMAKE_INSTALL_PREFIX directory. If this argument is not passed, the default behaviour is to use the CMAKE_INSTALL_PREFIX variable. The new signature is therefore: configure_package_config_file(<input> <output> INSTALL_DESTINATION <path> [PATH_VARS <var1> <var2> ... <varN>] [NO_SET_AND_CHECK_MACRO] [NO_CHECK_REQUIRED_COMPONENTS_MACRO] [INSTALL_PREFIX <path>])
| * | | CMakePackageConfigHelpers: restructure documentation and document commandsDaniele E. Domenichelli2014-08-111-120/+125
| | | |
| * | | CMakePackageConfigHelpers: Remove unused variableDaniele E. Domenichelli2014-08-041-2/+0
| |/ /
* | | Merge topic 'ExternalData-drop-security-disclaimer'Brad King2014-08-061-1/+1
|\ \ \ | | | | | | | | | | | | | | | | f2ccc14b ExternalData: Drop 'not security software' disclaimer (#15060)
| * | | ExternalData: Drop 'not security software' disclaimer (#15060)Brad King2014-08-051-1/+1
| |/ / | | | | | | | | | | | | | | | | | | Let clients do their own research on the current strength of each hash algorithm to choose what is best for their needs. Suggested-by: Nico Schlömer <nico.schloemer@gmail.com>
* | | CheckIncludeFiles: Use modern C declaration for 'main' (#15058)Nate Eldredge2014-08-051-1/+1
|/ / | | | | | | | | Otherwise some compilers will incorrectly fail the checks when certain warning/error flags are enabled.
* | 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.