summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ninja: Use forward slashes for any GCC on Windows (#15439)Thomas Herz2015-05-073-7/+11
| | | | | Any GCC compiler on a Windows host needs forward slashes, not just those built for MinGW.
* Ninja: Refactor detection of MinGW tools on WindowsBrad King2015-05-073-21/+16
| | | | | | | | | | | Check for CMAKE_COMPILER_IS_MINGW only after enabling a language when it might actually be set. Previously this worked by accident because the check for working compiler or a second language enabled would cause the code path to be taken. Store UsingMinGW as an instance member of cmGlobalNinjaGenerator so that it is reset on each reconfigure. Otherwise cmake-gui cannot switch between build trees for MinGW or non-MinGW tools.
* RC: Simplify selection of resource compiler based on C/C++ toolchainBrad King2015-05-077-35/+38
| | | | | | | | | | Revert the refactoring by commit v2.8.11~105^2~1 (Ninja: use MinGW generator code in EnableLanguage, 2013-03-09) and move the MinGW- specific logic back to the "MinGW Makefiles" generator. Instead teach the platform information modules for GNU and MSVC on Windows to set the preferred RC compiler just before enabling the RC language. This way we choose the RC compiler based on the C/C++ toolchain that is actually enabled.
* CMake Nightly Date StampKitware Robot2015-05-071-1/+1
|
* CMake Nightly Date StampKitware Robot2015-05-061-1/+1
|
* Merge topic 'refactor-cmPolicies'Brad King2015-05-0528-789/+521
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 013ada80 cmPolicies: Implement PolicyMap in terms of bitset. be6664c2 cmPolicies: Implement abstraction for PolicyMap. de211686 Port to static cmPolicies API. 13981f20 cmPolicies: Make all API static. 23e2bcc8 cmPolicies: Remove unused DefinePolicy method. 5641ba4f cmPolicies: Remove unused cmPolicy class. 3de54497 cmPolicies: Loop over all policies using enum constants. 387aff20 cmPolicies: Trivialize GetPolicyStatus method. dbf680d6 cmPolicies: Use more-direct ID access. 8c204133 cmPolicies: Implement in terms of public API. e3a8c029 cmPolicies: Make private method file-static. cb765af0 cmPolicies: Implement short description access with XMacros. 5df267fa cmPolicies: Implement version check with XMacro. 2235cfeb cmPolicies: Implement id to version with XMacro. 05d84388 cmPolicies: Implement id to string conversion with XMacro. 6eaade8a cmPolicies: Introduce XMacro table for policy data. ...
| * cmPolicies: Implement PolicyMap in terms of bitset.Stephen Kelly2015-05-042-5/+42
| |
| * cmPolicies: Implement abstraction for PolicyMap.Stephen Kelly2015-05-043-7/+34
| | | | | | | | Hide the detail that it is a std::map.
| * Port to static cmPolicies API.Stephen Kelly2015-05-0426-157/+83
| |
| * cmPolicies: Make all API static.Stephen Kelly2015-05-042-7/+7
| |
| * cmPolicies: Remove unused DefinePolicy method.Stephen Kelly2015-05-042-19/+0
| | | | | | | | Policies are no longer defined at runtime.
| * cmPolicies: Remove unused cmPolicy class.Stephen Kelly2015-05-042-339/+1
| |
| * cmPolicies: Loop over all policies using enum constants.Stephen Kelly2015-05-041-8/+8
| |
| * cmPolicies: Trivialize GetPolicyStatus method.Stephen Kelly2015-05-041-18/+5
| | | | | | | | | | It would be possible to implement this with an XMacro and switch statement, but every codepath currently would still return WARN.
| * cmPolicies: Use more-direct ID access.Stephen Kelly2015-05-041-2/+2
| |
| * cmPolicies: Implement in terms of public API.Stephen Kelly2015-05-041-1/+1
| |
| * cmPolicies: Make private method file-static.Stephen Kelly2015-05-042-31/+27
| |
| * cmPolicies: Implement short description access with XMacros.Stephen Kelly2015-05-041-15/+23
| |
| * cmPolicies: Implement version check with XMacro.Stephen Kelly2015-05-041-28/+27
| |
| * cmPolicies: Implement id to version with XMacro.Stephen Kelly2015-05-041-13/+21
| |
| * cmPolicies: Implement id to string conversion with XMacro.Stephen Kelly2015-05-042-26/+25
| |
| * cmPolicies: Introduce XMacro table for policy data.Stephen Kelly2015-05-041-72/+199
| | | | | | | | Use it to populate the policy enum.
| * cmPolicies: Implement more-compact IsPolicyNewerThan.Stephen Kelly2015-05-041-17/+6
| |
| * cmPolicies: Parse string for id conversion.Stephen Kelly2015-05-042-14/+37
| | | | | | | | Remove now-unused PolicyStringMap.
| * cmPolicies: Make private method file-static.Stephen Kelly2015-05-032-35/+31
| |
| * cmPolicies: Remove runtime check for programming errors.Stephen Kelly2015-05-031-26/+0
| |
| * cmPolicies: Remove unused forward declaration.Stephen Kelly2015-05-031-1/+0
| |
| * cmPolicies: Remove unused static data.Stephen Kelly2015-05-032-5/+0
| |
| * cmPolicies: Remove unused header.Stephen Kelly2015-05-031-1/+0
| |
| * cmPolicies: Fix values for policies 57-60.Stephen Kelly2015-05-031-1/+1
| |
* | Merge topic 'hp-gnu-asm'Brad King2015-05-051-0/+2
|\ \ | | | | | | | | | | | | f4734270 HP-UX: Add GNU compiler information for ASM language
| * | HP-UX: Add GNU compiler information for ASM languageBrad King2015-05-041-0/+2
| | | | | | | | | | | | Suggested-by: Gerhard Grimm <gerhard.grimm@detec.com>
* | | Merge topic 'InstallRequiredSystemLibraries-vs2015'Brad King2015-05-051-2/+10
|\ \ \ | | | | | | | | | | | | | | | | 9b2778d4 InstallRequiredSystemLibraries: Update for VS 2015 (#15552)
| * | | InstallRequiredSystemLibraries: Update for VS 2015 (#15552)Brad King2015-05-041-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The part of the MS C Runtime library that applications need to distribute has been renamed from "msvcr*.dll" to "vcruntime*.dll" starting with VS 2015. See the Visual C++ Team Blog: Introducing the Universal CRT http://blogs.msdn.com/b/vcblog/archive/2015/03/03/introducing-the-universal-crt.aspx
* | | | Merge topic 'refactor-cmMakefile-constructor'Brad King2015-05-052-9/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 42142d4f cmMakefile: Inline Intialize method in constructor f39f0c0a cmMakefile: Initialize SuppressWatches member before use
| * | | | cmMakefile: Inline Intialize method in constructorBrad King2015-05-042-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 80909041 (cmMakefile: Disable copy constructor, 2015-04-18) the only call to cmMakefile::Initialize is in one constructor. Inline it and drop the separate method.
| * | | | cmMakefile: Initialize SuppressWatches member before useBrad King2015-05-041-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 86f3cd0f (cmMakefile: Require the localGenerator in the constructor, 2015-04-27) we added use of GetDefinition to the Initialize method. Set SuppressWatches before calling this method since GetDefinition checks it.
* | | | | Merge topic 'FindGTest-fix-test-space-parsing'Brad King2015-05-051-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0f927b44 FindGTest: Fix parsing of test macro calls with spaces (#15553)
| * | | | | FindGTest: Fix parsing of test macro calls with spaces (#15553)Brad King2015-05-041-2/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Tolerate spaces before the open paren and after the test name before the comma.
* | | | | CMake Nightly Date StampKitware Robot2015-05-051-1/+1
|/ / / /
* | | | Merge topic 'truncate-snapshots'Brad King2015-05-041-2/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 83dc483e cmState: Truncate snapshot data in Initialize.
| * | | | cmState: Truncate snapshot data in Initialize.Stephen Kelly2015-05-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Configure is executed multiple times with the same cmake instance (either using CTest --two-config or a interactive gui), the location and structural data was preserved though it would not be used again. Fix that by clearing the data in a method called early in the configure step.
* | | | | Merge topic 'add-cmMakefile-GetGlobalGenerator'Brad King2015-05-0429-139/+97
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a0836ed9 Port to cmMakefile::GetGlobalGenerator. cbf143bb cmComputeTargetDepends: Use simpler global generator access. 040491fc cmComputeLinkDepends: Remove unused local generator. 0bb6dbe0 cmMakefile: Extract an accessor for the global generator. e1bdf5f5 cmMakefile: Use GetCMakeInstance. efcca935 cmMakefile: Simplify GetCMakeInstance implementation.
| * | | | | Port to cmMakefile::GetGlobalGenerator.Stephen Kelly2015-05-0325-122/+86
| | | | | |
| * | | | | cmComputeTargetDepends: Use simpler global generator access.Stephen Kelly2015-05-031-3/+1
| | | | | |
| * | | | | cmComputeLinkDepends: Remove unused local generator.Stephen Kelly2015-05-032-5/+1
| | | | | |
| * | | | | cmMakefile: Extract an accessor for the global generator.Stephen Kelly2015-05-032-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both for convenience, and because cmMakefile should not be the way to get access to the local generator, so that should go away in the future.
| * | | | | cmMakefile: Use GetCMakeInstance.Stephen Kelly2015-05-031-4/+2
| | | | | |
| * | | | | cmMakefile: Simplify GetCMakeInstance implementation.Stephen Kelly2015-05-031-5/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | No callers handle the possibility that it can return null, and that is no longer possible anyway.
* | | | | Merge topic 'refactor-cmDefinitions-Get'Brad King2015-05-043-38/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c7dad41 cmDefinitions: Make Get method static. a7ce0c7b cmDefinitions: Make GetInternal method static. 7a5039fa cmDefinitions: Use static member without this->. 191573f7 cmDefinitions: Remove Parent pointer. 8b1745a1 cmDefinitions: Accept varStack iterators in Get API.