summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'add-link-search-static-properties-defaults'Brad King2015-09-011-5/+3
|\ | | | | | | | | 9e21b01a Revert LINK_SEARCH_{START,END}_STATIC behavior change
| * Revert LINK_SEARCH_{START,END}_STATIC behavior changeBrad King2015-08-311-5/+3
| | | | | | | | | | | | | | The changes to cmComputeLinkInformation.cxx in commit 675ef165 (Allow LINK_SEARCH_{START,END}_STATIC props to have default values, 2015-08-07) are unrelated to the feature added by that change and are incorrect. They lead to cases of extra -Bdynamic flags. Revert them.
* | CMake Nightly Date StampKitware Robot2015-09-011-1/+1
| |
* | Merge topic 'makefile-color-when-needed'Brad King2015-08-311-1/+1
|\ \ | | | | | | | | | | | | bfb9d34f Makefile: Print color escapes only when necessary
| * | Makefile: Print color escapes only when necessaryBrad King2015-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach cmSystemTools::MakefileColorEcho to use the color printing API only when we actually have a color to print. This avoids printing escape sequences that do not change the text attributes. Since commit v3.3.0-rc1~480^2~4 (Makefile: Fix output during parallel builds, 2015-02-05) we always use this code path to print progress and rule messages even when color is disabled (e.g. in a try_compile). It is important to avoid printing escapes when there is no color because on MSYS we have no isatty and so assume that vt100 escapes are supported, but we do not want to print them when capturing try_compile output. If we capture the vt100 escapes in try_compile output, they contain unbalanced square brackets. This causes CMakeParseImplicitLinkInfo to fail to separate lines in a ;-list and therefore fail to extract information from the link line. Then mixed-language linking breaks.
* | | Merge topic 'vs-store-phone-cert-thumbs'Brad King2015-08-316-15/+111
|\ \ \ | | | | | | | | | | | | | | | | | | | | ac0bb433 VS: Windows Store/Phone package cert thumbprint 92b835ec Simplify condition for using rpcrt4 library on Windows
| * | | VS: Windows Store/Phone package cert thumbprintGilles Khouzam2015-08-275-2/+109
| | | | | | | | | | | | | | | | | | | | Add the PackageCertificateThumbprint property when there is a certificate on a WindowsStore or Phone app.
| * | | Simplify condition for using rpcrt4 library on WindowsBrad King2015-08-272-13/+2
| | | | | | | | | | | | | | | | | | | | Drop the CMAKE_BUILD_ON_VISUAL_STUDIO variable and hard-code the condition at its only use.
* | | | Merge topic 'fix-ctest-xml-double-encoding'Brad King2015-08-318-20/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab2524d6 CTest: Fix XML double-encoding cases dee84dc7 cmCTest{BZR,GIT,P4}: Remove unused cmXMLSafe includes b3372db5 cmExtra{Kate,SublimeText}Generator: Remove unused cmXMLSafe includes
| * | | | CTest: Fix XML double-encoding casesDaniel Pfeifer2015-08-283-15/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove use of cmXMLSafe from CTest when generating content that is later handled by cmXMLWriter. This was broken by refactoring in the topic merged by commit v3.3.0-rc1~22 (Merge topic 'ctest-xml-refactor', 2015-05-28).
| * | | | cmCTest{BZR,GIT,P4}: Remove unused cmXMLSafe includesDaniel Pfeifer2015-08-283-3/+0
| | | | |
| * | | | cmExtra{Kate,SublimeText}Generator: Remove unused cmXMLSafe includesDaniel Pfeifer2015-08-282-2/+0
| | |/ / | |/| |
* | | | Merge topic 'FindJNI-mips'Brad King2015-08-311-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 90a22c3a FindJNI: Add mips64(el) mipsn32(el) support (#15714)
| * | | | FindJNI: Add mips64(el) mipsn32(el) support (#15714)Yunqiang Su2015-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | Submitted-by: Felix Geyer <fgeyer@debian.org>
* | | | | Merge topic 'cpack-config-generation-test'Brad King2015-08-316-0/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 674dc0b3 CPack generator independent tests
| * | | | | CPack generator independent testsRoman Donchenko2015-08-286-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPackConfig.cmake file generation from CMake test suite. Currently it contains only a simple test without special characters in variable value. Test is not part of RunCMake/CPack as those tests are expected to be run for a specified generator.
* | | | | | Merge topic 'refactor-compute'Brad King2015-08-315-10/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 616d8f02 cmGeneratorTarget: Rename method to match operation. ec56d244 cmGlobalGenerator: Process evaluation files after target depends. 1e5349a5 cmGlobalGenerator: Access makefile from makefiles container.
| * | | | | | cmGeneratorTarget: Rename method to match operation.Stephen Kelly2015-08-305-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The manifest is computed, not generated, according to current language used in cmake method naming.
| * | | | | | cmGlobalGenerator: Process evaluation files after target depends.Stephen Kelly2015-08-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to generate the files if computation aborts generation.
| * | | | | | cmGlobalGenerator: Access makefile from makefiles container.Stephen Kelly2015-08-291-2/+1
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'generate-time-generators'Brad King2015-08-3150-247/+176
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2b9a25d7 cmGlobalGenerator: Create global targets directly after Configure. 3e08b4df cmMakefile: Skip Global targets for CMP0019 evaluation. 357bf469 cmGlobalGenerator: Fill the project map at compute time. ebf8d0a9 cmGlobalGenerator: Rename method. bd096d30 cmGlobalGenerator: Avoid cmLocalGenerator until after Configure. ff8ac8ee cmLocalGenerator: Create from already-constructed cmMakefile. 0bd7279f Ninja: Remove some incorrect comments adding no value. 2f2d4da9 cmCTestScriptHandler: Simplify deletes. 7fdc9a8b QtAutogen: Use a smart pointer. 92041eec cmGlobalGenerator: Remove MakeLocalGenerator method. acb00622 cmGlobalGenerator: Require a snapshot to create a local generator. 83b8a927 cmMakefile: Remove cmLocalGenerator member. 9b6a743b cmLocalGenerator: Remove Parent pointer.
| * | | | | | cmGlobalGenerator: Create global targets directly after Configure.Stephen Kelly2015-08-281-19/+16
| | | | | | |
| * | | | | | cmMakefile: Skip Global targets for CMP0019 evaluation.Stephen Kelly2015-08-281-1/+2
| | | | | | |
| * | | | | | cmGlobalGenerator: Fill the project map at compute time.Stephen Kelly2015-08-281-4/+4
| | | | | | |
| * | | | | | cmGlobalGenerator: Rename method.Stephen Kelly2015-08-282-3/+3
| | | | | | |
| * | | | | | cmGlobalGenerator: Avoid cmLocalGenerator until after Configure.Stephen Kelly2015-08-281-4/+4
| | | | | | |
| * | | | | | cmLocalGenerator: Create from already-constructed cmMakefile.Stephen Kelly2015-08-2849-116/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't manage the lifetime of the cmMakefile with cmLocalGenerator.
| * | | | | | Ninja: Remove some incorrect comments adding no value.Stephen Kelly2015-08-281-11/+0
| | | | | | |
| * | | | | | cmCTestScriptHandler: Simplify deletes.Stephen Kelly2015-08-281-26/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Deleting a nullptr is fine.
| * | | | | | QtAutogen: Use a smart pointer.Stephen Kelly2015-08-281-2/+1
| | | | | | |
| * | | | | | cmGlobalGenerator: Remove MakeLocalGenerator method.Stephen Kelly2015-08-2814-27/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Inline implementation to callers.
| * | | | | | cmGlobalGenerator: Require a snapshot to create a local generator.Stephen Kelly2015-08-2812-20/+31
| | | | | | |
| * | | | | | cmMakefile: Remove cmLocalGenerator member.Stephen Kelly2015-08-283-9/+10
| | | | | | |
| * | | | | | cmLocalGenerator: Remove Parent pointer.Stephen Kelly2015-08-2839-88/+49
| |/ / / / /
* | | | | | Merge topic 'GenerateExportHeader-cygwin-dllexport'Brad King2015-08-312-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e2865b4 GenerateExportHeader: Use dllexport/dllimport on Cygwin
| * | | | | | GenerateExportHeader: Use dllexport/dllimport on CygwinTony Kelman2015-08-272-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cygwin sits on top of Windows and so can use explicit symbol export and import markup too. Co-Author: Yaakov Selkowitz <yselkowitz@cygwin.com>
* | | | | | | CMake Nightly Date StampKitware Robot2015-08-311-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-08-301-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-08-291-1/+1
| |/ / / / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-08-281-1/+1
|/ / / / /
* | | | | Merge topic 'use-generator-target'Brad King2015-08-2725-1371/+1527
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c2b7336f cmGeneratorTarget: Move GetConfigCommonSourceFiles from cmTarget. 69329fff cmGeneratorTarget: Move GetLanguages from cmTarget. 0431f2c4 cmGeneratorTarget: Move ComputeLinkImplementationLanguages from cmTarget. abe9505d cmGeneratorTarget: Move HaveBuildTreeRPath from cmTarget. d4a24c0e cmGeneratorTarget: Move GetLinkImplementation from cmTarget. 83981cf5 cmTarget: Add GetLinkImplMap method. 771e79a2 cmLinkItem: Add cmOptionalLinkImplementation type. 3846ebcf cmLinkItem: Add cmLinkImplementation type. a7f5d70d cmGeneratorTarget: Move compile defintions processing from cmTarget. d051086c cmGeneratorTarget: Move compile features processing from cmTarget. db4cb92b cmGeneratorTarget: Move compile options processing from cmTarget. e6ccbf6f cmGeneratorTarget: Move include directory processing from cmTarget. 8bfb0c53 cmGeneratorTarget: Move link iface helpers from cmTarget. 2cb3e574 cmGeneratorTarget: Move GetImportLinkInterface from cmTarget. 6d3d099b cmGeneratorTarget: Move ComputeLinkInterfaceLibraries from cmTarget. 0db9d927 cmGeneratorTarget: Move GetLinkInterfaceLibraries from cmTarget. ...
| * | | | | cmGeneratorTarget: Move GetConfigCommonSourceFiles from cmTarget.Stephen Kelly2015-08-2610-72/+88
| | | | | |
| * | | | | cmGeneratorTarget: Move GetLanguages from cmTarget.Stephen Kelly2015-08-269-59/+71
| | | | | |
| * | | | | cmGeneratorTarget: Move ComputeLinkImplementationLanguages from cmTarget.Stephen Kelly2015-08-264-18/+19
| | | | | |
| * | | | | cmGeneratorTarget: Move HaveBuildTreeRPath from cmTarget.Stephen Kelly2015-08-265-18/+19
| | | | | |
| * | | | | cmGeneratorTarget: Move GetLinkImplementation from cmTarget.Stephen Kelly2015-08-267-34/+34
| | | | | |
| * | | | | cmTarget: Add GetLinkImplMap method.Stephen Kelly2015-08-262-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | This is a temporary refactoring artifact.
| * | | | | cmLinkItem: Add cmOptionalLinkImplementation type.Stephen Kelly2015-08-263-56/+49
| | | | | | | | | | | | | | | | | | | | | | | | Move the associated Compute* methods to the cmTarget class.
| * | | | | cmLinkItem: Add cmLinkImplementation type.Stephen Kelly2015-08-267-14/+15
| | | | | |
| * | | | | cmGeneratorTarget: Move compile defintions processing from cmTarget.Stephen Kelly2015-08-2614-182/+141
| | | | | |