summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'desktop-icon'Brad King2014-05-081-1/+1
|\
| * cmake-gui: Fix desktop file icon configurationJohannes Huber2014-05-071-1/+1
* | CMake Nightly Date StampKitware Robot2014-05-081-1/+1
* | Merge topic 'dev/source-file-performance'Brad King2014-05-074-51/+56
|\ \
| * | cmSourceFile: Take a stringBen Boeckel2014-04-291-1/+1
| * | perf: Cache the language property stringBen Boeckel2014-04-292-2/+6
| * | cmSourceFile: Cache the isUiFile checkBen Boeckel2014-04-292-3/+4
| * | cmSourceFileLocation: Return a string referenceBen Boeckel2014-04-291-1/+1
| * | cmSourceFileLocation: Save some string copiesBen Boeckel2014-04-291-6/+6
| * | cmSourceFileLocation: Simplify logic in MatchesBen Boeckel2014-04-291-36/+35
| * | cmSourceFileLocation: Avoid string allocation in extension checkingBen Boeckel2014-04-291-2/+3
* | | Merge topic 'dev/regex-variables'Brad King2014-05-075-42/+62
|\ \ \
| * | | StoreMatches: Minor cleanupsBen Boeckel2014-04-291-3/+3
| * | | ClearMatches: Store match variable names staticallyBen Boeckel2014-04-291-11/+20
| * | | ClearMatches: Only clear matches which were actually setBen Boeckel2014-04-295-42/+53
| |/ /
* | | Merge topic 'dev/hashmap-for-targets'Brad King2014-05-076-15/+26
|\ \ \
| * | | cmGlobalGenerator: Store targets in hash mapsBen Boeckel2014-05-074-10/+17
| * | | cmMakefile: Use a hashmap for imported targetsBen Boeckel2014-05-072-5/+9
* | | | Merge topic 'dev/refactor-source-depends-in-ninja'Brad King2014-05-0712-59/+100
|\ \ \ \
| * | | | ninja: Factor out custom command order-only dependsBen Boeckel2014-05-071-14/+15
| * | | | ninja: Factor out target-level order-only dependenciesBen Boeckel2014-05-072-5/+26
| * | | | LocalGenerator: Add a string overload for AppendFlagsBen Boeckel2014-05-078-20/+38
| * | | | ninja: Don't use a stringstream to build an argument listBen Boeckel2014-05-021-14/+14
| * | | | ninja: Use string parametersBen Boeckel2014-05-024-7/+8
| |/ / /
* | | | Merge topic 'compiler-id-comment'Brad King2014-05-072-2/+2
|\ \ \ \
| * | | | Project: Clarify comment about platform-native compilers.Stephen Kelly2014-05-072-2/+2
* | | | | Merge topic 'no-assert-missing-objlib'Brad King2014-05-075-2/+31
|\ \ \ \ \
| * | | | | cmTarget: Don't assert on object libraries for configure-time location.Stephen Kelly2014-05-065-2/+31
* | | | | | Merge branch 'release'Brad King2014-05-070-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'hpux-compile' into releaseBrad King2014-05-062-2/+38
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'backport-kwsys-compile-fix' into releaseBrad King2014-05-061-28/+15
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'InstallRequiredSystemLibraries-vs12-mfc' into releaseBrad King2014-05-061-4/+21
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'backport-kwsys-compile-fix'Brad King2014-05-070-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | KWSys SystemInformation: Include backtrace APIs whenever we use themBrad King2014-05-061-28/+15
| |/ / / / / / /
* | | | | | | | Merge topic 'osx-iframework'Brad King2014-05-073-3/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | OS X: Use -iframework for system framework directoriesMikoĊ‚aj Siedlarek2014-05-073-3/+24
* | | | | | | | | Merge topic 'xcode-sdkroot'Brad King2014-05-071-14/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Xcode: Find fallback SDK if one matching the OS version doesn't exist.Clinton Stimpson2014-05-061-14/+29
* | | | | | | | | | Merge topic 'InstallRequiredSystemLibraries-vs12-mfc'Brad King2014-05-071-4/+21
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | InstallRequiredSystemLibraries: MBCS MFC is optional on VS 12 (#14903)Felix Krause2014-05-061-4/+21
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'ExternalProject_labels'Brad King2014-05-071-0/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ExternalProject: Set FOLDER property to targetsDaniele E. Domenichelli2014-05-051-0/+3
| * | | | | | | | | ExternalProject: Set LABELS property to targetsDaniele E. Domenichelli2014-05-051-0/+2
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'update-kwsys'Brad King2014-05-072-28/+18
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-05-062-28/+18
| |\ \ \ \ \ \ \ \
| | * | | | | | | | KWSys 2014-05-05 (f3a36760)KWSys Robot2014-05-062-28/+18
* | | | | | | | | | CMake Nightly Date StampKitware Robot2014-05-071-1/+1
* | | | | | | | | | Merge topic 'CMAKE_CXX_KNOWN_FEATURES-global-property'Brad King2014-05-069-60/+64
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Features: Make CMAKE_CXX_KNOWN_FEATURES a property.Stephen Kelly2014-05-029-60/+64
* | | | | | | | | | | Merge topic 'dont-rewrite-moc-parameter-file'Brad King2014-05-063-26/+51
|\ \ \ \ \ \ \ \ \ \ \