summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* VS: Fix generation of desktop applications for ARMGilles Khouzam2014-08-121-0/+5
| | | | | | Add WindowsSDKDesktopARMSupport to the .vcxproj to avoid 'error MSB8022: Compiling Desktop applications for the ARM platform is not supported.' from VS.
* 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>
* Help: Add notes for topic 'vs-windows-phone-and-store'Brad King2014-08-051-0/+10
|
* VS: Set WindowsPhone and WindowsStore min VS version requiredGilles Khouzam2014-07-311-0/+12
| | | | | Generate the MinimumVisualStudioVersion element in the .vcxproj file based on the version of WindowsPhone or WindowsStore to be targeted.
* VS: Generate WindowsPhone and WindowsStore application typesGilles Khouzam2014-07-312-0/+23
| | | | | Generate the ApplicationType and ApplicationTypeRevision elements in .vcxproj files.
* VS: Add .sln "Deploy" mark for WindowsPhone and WindowsStore binariesGilles Khouzam2014-07-312-0/+17
|
* 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-314-0/+16
| | | | | 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>
* VS: Select WindowsPhone and WindowsStore default toolsetsBrad King2014-07-316-1/+139
| | | | | | | | Teach the VS >= 10 generators to recognize these system names and select the appropriate default toolset for the system version. Report an error when the version is not known to be supported by VS. Inspired-by: Gilles Khouzam <gillesk@microsoft.com>
* VS: Save WindowsPhone and WindowsStore system internallyBrad King2014-07-312-0/+20
| | | | | | | | Add boolean members to the VS >= 10 global generator to save whether CMAKE_SYSTEM_NAME is WindowsPhone or WindowsStore without having to repeat a string comparison. Inspired-by: Gilles Khouzam <gillesk@microsoft.com>
* VS: Always add IgnoreSpecificDefaultLibraries to .vcxproj filesBrad King2014-07-311-0/+2
| | | | | | Append %(IgnoreSpecificDefaultLibraries) to any user-specified libraries so that the system-default list of libraries to ignore is honored even when the user specifies more.
* cmIDEOptions: Add an AppendFlag method to update multi-valued optionsBrad King2014-07-312-0/+8
|
* VS: Add internal API to get system name and versionBrad King2014-07-311-0/+6
| | | | | Add cmGlobalVisualStudio10Generator::GetSystemName and GetSystemVersion methods to access the corresponding members publicly.
* VS: Refactor logic deciding to add "Deploy" to the .sln fileGilles Khouzam2014-07-312-3/+13
| | | | | Move the condition to a "NeedsDeploy" virtual method that can be overridden by more recent VS generators.
* VS: Add missing newline after .vcxproj user prop import lineGilles Khouzam2014-07-311-1/+1
|
* Merge branch 'release'Brad King2014-07-310-0/+0
|\
| * Merge branch 'check-flag-avoid-semicolon' into releaseBrad King2014-07-301-1/+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 'fix-CMP0049-extra-error'Brad King2014-07-315-5/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | b2282631 cmTarget: Do not mistake a preceding error for a CMP0049 failure
| * | | | cmTarget: Do not mistake a preceding error for a CMP0049 failureBrad King2014-07-305-5/+21
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After calls to ProcessSourceItemCMP0049, check for an empty return string to detect a failure instead of trusting GetErrorOccuredFlag. The latter could have been left from a preceding non-fatal error. Extend the RunCMake.Configure test to cover a case that exposed this problem.
* | | | Merge topic 'update_jacoco_search_paths'Brad King2014-07-311-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 9fd04f87 CTEST: Update Jacoco Coverage search paths
| * | | | CTEST: Update Jacoco Coverage search pathsJoseph Snyder2014-07-301-0/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new additional entry to the FilePaths array when a "package" tag has been found. This path should consist of the package information found appended to the projects source directory. This change will allow code held in a /src/main/java/* directory off of the projects source directory to be found, unlike now which assumes a subdirectory contains the code.
* | | | Merge topic 'cpack-ifw-generator'Brad King2014-07-314-11/+112
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | e7511b7f CPackIFW: Add package configuration variables b2340001 CPackIFW: Document cpack_ifw_configure_component DEPENDS option
| * | | | CPackIFW: Add package configuration variablesKonstantin Podsvirov2014-07-294-11/+109
| | | | |
| * | | | CPackIFW: Document cpack_ifw_configure_component DEPENDS optionKonstantin Podsvirov2014-07-291-0/+3
| | | | |
* | | | | Merge topic 'pdb-genex'Brad King2014-07-3114-34/+189
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3114-0/+143
| | | | | |
| * | | | | Genex: Simplify filesytem artifact codeNils Gladitz2014-07-291-35/+47
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-07-311-1/+1
| |_|/ / / |/| | | |
* | | | | Merge branch 'release'Brad King2014-07-300-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'FindQt4-more-plugins' into releaseBrad King2014-07-281-3/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'xcode-6-librarian-flags' into releaseBrad King2014-07-282-5/+24
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'remove-link-remnants'Brad King2014-07-302-7/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 250ad08a Ninja: Remove _COMPILER_LINKER_OPTION_FLAG_ remnants
| * | | | | | | Ninja: Remove _COMPILER_LINKER_OPTION_FLAG_ remnantsNils Gladitz2014-07-292-7/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge topic 'vs-refactor-source-tools'Brad King2014-07-302-21/+54
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0ac28adc VS: Map .jpg and .png sources to Image tool 58bb14d4 VS: Map .xml to XML tool 972cf1d7 VS: Map .appxmanifest sources to AppxManifest tool 15fb1022 VS: Refactor handling of resx headers c2ef6d23 VS: Refactor handling of "header" sources in VS >= 10 2df38911 VS: Refactor handling of "extra" sources in VS >= 10 143b4005 VS: Convert 'WriteSource' tool argument to std::string
| * | | | | | | VS: Map .jpg and .png sources to Image toolBrad King2014-07-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inspired-by: Gilles Khouzam <gillesk@microsoft.com>
| * | | | | | | VS: Map .xml to XML toolBrad King2014-07-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inspired-by: Gilles Khouzam <gillesk@microsoft.com>
| * | | | | | | VS: Map .appxmanifest sources to AppxManifest toolBrad King2014-07-291-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inspired-by: Minmin Gong <minmin.gong@gmail.com>
| * | | | | | | VS: Refactor handling of resx headersBrad King2014-07-291-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move generation of the ClInclude element to WriteHeaderSource.
| * | | | | | | VS: Refactor handling of "header" sources in VS >= 10Brad King2014-07-292-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a WriteHeaderSource method to handle writing of sources classified by cmGeneratorTarget as header files. This will be useful to add special VS-specific handling for some headers.