summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cmGlobalGenerator-Build-output-ref'Brad King2014-08-047-51/+26
|\ | | | | | | | | 30983ebe cmGlobalGenerator: Take Build output argument by reference
| * cmGlobalGenerator: Take Build output argument by referenceBrad King2014-07-317-51/+26
| | | | | | | | | | | | No call sites pass NULL to the output argument, so take it by reference to avoid the if(output) conditions. Propagate the change through the TryCompile APIs that call it.
* | Merge topic 'vs-internal-system-apis'Brad King2014-08-041-0/+6
|\ \ | | | | | | | | | | | | 0a5fe279 VS: Add internal API to get system name and version
| * | 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.
* | | Merge topic 'vs-refactor-sln-deploy'Brad King2014-08-042-3/+13
|\ \ \ | |/ / | | | | | | | | | fe161dc3 VS: Refactor logic deciding to add "Deploy" to the .sln file
| * | 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.
* | | Merge topic 'vs-vcxproj-missing-newline'Brad King2014-08-041-1/+1
|\ \ \ | |/ / | | | | | | | | | 66edd065 VS: Add missing newline after .vcxproj user prop import line
| * | VS: Add missing newline after .vcxproj user prop import lineGilles Khouzam2014-07-311-1/+1
| |/
* | 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.
* | Merge topic 'check-flag-for-fujitsu'Brad King2014-08-041-0/+1
|\ \ | | | | | | | | | | | | 5570d8d3 Check*CompilerFlag: Add pattern for Fujitsu compiler (#15051)
| * | Check*CompilerFlag: Add pattern for Fujitsu compiler (#15051)Erik Lindahl2014-07-311-0/+1
| | |
* | | Merge topic 'link-line-dedup'Brad King2014-08-042-2/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | ccec6df8 Help: Add notes for topic 'link-line-dedup' 9f7e27fc De-duplicate shared library targets in generated link lines
| * | | Help: Add notes for topic 'link-line-dedup'Brad King2014-07-301-0/+5
| | | |
| * | | De-duplicate shared library targets in generated link linesBrad King2014-07-301-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The linker will bring in shared libraries as a whole and use them even for symbols that are needed by entries later in the link line. Therefore we do not need to repeat them. De-duplicate link entries that we know are shared libraries because we have a cmTarget associated with them. Tested-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
* | | | CMake Nightly Date StampKitware Robot2014-08-041-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-08-031-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-08-021-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-08-011-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>
generated by cgit v0.12 at 2024-11-13 21:55:30 (GMT)