summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update .gitignoreTobias Hunger2016-09-121-0/+5
| | | | Ignore *.user* files from QtCreator and *.pyc files.
* Merge topic 'clang-tidy'Brad King2016-09-123-28/+12
|\ | | | | | | | | | | | | | | 73128b82 cmDependsFortran: simplify boolean expression 8f324c7c cmSystemTools: simplify boolean expressions 5d3b5bef QCMakeCacheView: simplify boolean expression ad42eb33 QCMakeCacheView: no else after return
| * cmDependsFortran: simplify boolean expressionDaniel Pfeifer2016-09-121-6/+1
| |
| * cmSystemTools: simplify boolean expressionsDaniel Pfeifer2016-09-121-15/+5
| |
| * QCMakeCacheView: simplify boolean expressionDaniel Pfeifer2016-09-081-4/+1
| |
| * QCMakeCacheView: no else after returnDaniel Pfeifer2016-09-081-3/+5
| |
* | Merge topic 'bzip2-imported-targets'Brad King2016-09-126-1/+92
|\ \ | | | | | | | | | | | | | | | | | | 79eba4b7 Help: Add notes for topic 'bzip2-imported-targets' 069cac58 Tests: Add FindBZip2 unit tests e9ce0503 FindBZip2: Add imported target
| * | Help: Add notes for topic 'bzip2-imported-targets'Brad King2016-09-091-0/+4
| | |
| * | Tests: Add FindBZip2 unit testsRoger Leigh2016-09-094-0/+53
| | |
| * | FindBZip2: Add imported targetRoger Leigh2016-09-091-1/+35
| |/
* | Merge topic 'drop-cygwin-binary'Brad King2016-09-1212-399/+0
|\ \ | | | | | | | | | | | | db915a37 Utilities/Release: Drop Cygwin binary
| * | Utilities/Release: Drop Cygwin binaryBrad King2016-09-1212-399/+0
| | | | | | | | | | | | | | | Cygwin has packaged CMake independently of upstream for a long time. See its [cygport](https://github.com/cygwinports/cmake).
* | | Merge topic 'wix-feature-patch'Brad King2016-09-125-9/+21
|\ \ \ | | | | | | | | | | | | | | | | c0bccc51 CPackWIX: Enabled patching of WIX <Feature> tags
| * | | CPackWIX: Enabled patching of WIX <Feature> tagsMichael Stürmer2016-09-095-9/+21
| | | |
* | | | Merge topic 'vs-default-v100'Brad King2016-09-121-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 861f1b3d VS: Do not default to missing v100 64-bit toolset on VS 2010 Express
| * | | | VS: Do not default to missing v100 64-bit toolset on VS 2010 ExpressBrad King2016-09-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 059c230d (VS: Explicitly default to v100 toolset in Visual Studio 2010, 2016-07-21) the VS 2010 generator now correctly defaults to the v100 toolset instead of no toolset. However, this broke our logic for defaulting to the `Windows7.1SDK` toolset for 64-bit builds on VS 2010 Express. Fix the logic by ignoring the `v100` default in the case.
* | | | | Merge topic 'libuv-link-kvm'Brad King2016-09-121-0/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c6d83a15 libuv: Link with kvm on NetBSD and OpenBSD 6a497bb0 libuv: Link with kvm on FreeBSD
| * | | | | libuv: Link with kvm on NetBSD and OpenBSDBrad King2016-09-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We include the `kvm.h` header on these platforms and call kvm APIs. Link with the library to ensure they are available.
| * | | | | libuv: Link with kvm on FreeBSDRoger Leigh2016-09-091-0/+3
| | |_|_|/ | |/| | | | | | | | | | | | | Add it unconditionally. It is present in FreeBSD 11, 10 and 9.
* | | | | CMake Nightly Date StampKitware Robot2016-09-121-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-09-111-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-09-101-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'GetPrerequisites-absolute-ucrt'Brad King2016-09-091-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 258b7b28 GetPrerequisites: Recognize absolute paths to UCRT system libraries
| * | | | GetPrerequisites: Recognize absolute paths to UCRT system librariesBrad King2016-09-081-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The matching expression added by commit v3.5.0-rc1~33^2 (GetPrerequisites: Define api-ms-win-* files as system libraries, 2016-01-19) did not account for absolute paths to the UCRT libraries. We already recognize absolute paths to the MSVC runtime libraries. Do this for UCRT libraries too. Issue: #16240
* | | | Merge topic 'cmGeneratorTarget-cleanup'Brad King2016-09-092-20/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc6b948e cmGeneratorTarget: factor out common part of AddSources commands 52052ef8 cmGeneratorTarget: use erase-unique instead of reinitialization 3b362230 cmGeneratorTarget: don't clear container in destructor
| * | | | cmGeneratorTarget: factor out common part of AddSources commandsDaniel Pfeifer2016-09-082-11/+10
| | | | |
| * | | | cmGeneratorTarget: use erase-unique instead of reinitializationDaniel Pfeifer2016-09-081-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Just to make it easier to find places where containers are cleared in order to be recomputed.
| * | | | cmGeneratorTarget: don't clear container in destructorDaniel Pfeifer2016-09-081-1/+0
| |/ / / | | | | | | | | | | | | | | | | It will be destroyed anyway. This also makes it easier to search for places where containers are atually cleared in order to be recomputed.
* | | | Merge topic 'parse_arguments_argv_n'Brad King2016-09-0917-4/+139
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | cb299acc cmake_parse_arguments: Add option to read arguments from ARGC/ARGV#
| * | | | cmake_parse_arguments: Add option to read arguments from ARGC/ARGV#Bill Hoffman2016-09-0817-4/+139
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `ARGC`/`ARGV#` variables in function scope hold the original arguments with no ;-list flattening. Add a way for functions to cleanly parse arguments that may contain `;`. This also avoids extra copying of the arguments. Co-Author: Brad King <brad.king@kitware.com>
* | | | Merge topic 'fortran-parser-keywords'Brad King2016-09-096-491/+567
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 695f0d0d cmFortranParser: Parse keywords as lexical tokens 1619fb46 cmFortranParser: Simplify grammar by skipping unknown statements
| * | | | cmFortranParser: Parse keywords as lexical tokensBrad King2016-09-086-466/+581
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the lexer to match and return specific Fortran keywords as tokens. Update the parser to use these instead of always using a WORD token and then checking the text. This avoids extra string comparisons and will allow more grammar productions to be unambiguously added later for additional Fortran statements.
| * | | | cmFortranParser: Simplify grammar by skipping unknown statementsBrad King2016-09-082-191/+152
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Our Fortran grammar is a bare minimum to extract dependencies. Other statement syntax can be ignored, so simply skip to the end of unrecognized statements. This allows some of our existing productions to be dropped.
* | | | Merge topic 'fortran-scanbuild-fixes'Brad King2016-09-091-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 52b95d88 CTestCustom: Suppress scan-build warnings in flex-generated lexer
| * | | | CTestCustom: Suppress scan-build warnings in flex-generated lexerBrad King2016-09-081-0/+1
| |/ / /
* | | | Merge topic 'update-kwiml'Brad King2016-09-095-5/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f2c98e12 Merge branch 'upstream-KWIML' into update-kwiml e83b96b7 KWIML 2016-09-08 (d564b3c7) aa668280 kwiml: Update import script for new upstream URL
| * \ \ \ Merge branch 'upstream-KWIML' into update-kwimlBrad King2016-09-084-4/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWIML: KWIML 2016-09-08 (d564b3c7) Closes: #16290
| | * | | | KWIML 2016-09-08 (d564b3c7)KWIML Upstream2016-09-084-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwiml.git at commit d564b3c71a6dcec9b1cd84afb498b14a69307780 (master). Upstream Shortlog ----------------- Brad King (1): d564b3c7 Update copyright year Richard W.M. Jones (1): 12f000d5 abi.h: Add RISC-V, a little-endian architecture.
| * | | | | kwiml: Update import script for new upstream URLBrad King2016-09-081-1/+1
| | |/ / / | |/| | |
* | | | | Merge topic 'FindMatlab-regression-tests-print-on-error'Brad King2016-09-091-3/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | 1031e5d9 FindMatlab: add verbosity to the nightly tests
| * | | | FindMatlab: add verbosity to the nightly testsRaffi Enficiaud2016-09-081-3/+3
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-09-091-1/+1
| |/ / / |/| | |
* | | | Merge topic 'fortran-depend-cleanup'Brad King2016-09-0810-1365/+1291
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d28da906 cmFortranParser: Inject a newline at end-of-file when missing 8c65a501 cmFortranParser: Revise indentation style to match rest of CMake f70c71c5 cmFortranLexer: Update to flex 2.6 e11cd31f Fortran: Warn when dependency scanning fails to parse a source file
| * | | | cmFortranParser: Inject a newline at end-of-file when missingBrad King2016-09-062-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our parser grammar expects all statements to end in an `EOSTMT` token such as a newline. Ensure that the last statement in a file can be parsed even if it is missing a newline.
| * | | | cmFortranParser: Revise indentation style to match rest of CMakeBrad King2016-09-063-333/+260
| | | | | | | | | | | | | | | | | | | | While at it, remove unused token CPP_TOENDL.
| * | | | cmFortranLexer: Update to flex 2.6Brad King2016-09-065-1026/+1005
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise the documented modifications we need to make to the flex-generated source file according to the needs of the new version. Also drop the duplicate copyright notice block from the generated file.
| * | | | Fortran: Warn when dependency scanning fails to parse a source fileBrad King2016-09-063-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We expect to handle all relevant statements and ignore those that we do not understand. Warn if this process ever fails. Otherwise dependency information may be silently left out.
* | | | | Merge topic 'vs-15-generator'Brad King2016-09-0819-12/+290
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bdc679a8 VS15: Add Visual Studio 15 generator a8936656 VS: Update v140 flag tables from VS 15 MSBuild files 21346d3f Features: Record features for VS 15 Preview 4
| * | | | | VS15: Add Visual Studio 15 generatorBrad King2016-09-0715-8/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call the generator "Visual Studio 15" without any year because the preview version of VS 15 does not provide a year in the product name. Copy cmGlobalVisualStudio14Generator to cmGlobalVisualStudio15Generator and update version numbers accordingly. Add the VS15 enumeration value. Note that we do not need to add a MSVC15 variable or v150 toolset because Visual Studio 15 comes with an updated version of the v140 toolset and remains ABI-compatible. Teach tests VSExternalInclude, RunCMake.GeneratorPlatform, and RunCMake.GeneratorToolset to treat VS 15 as they do VS 10-14. Closes: #16143
| * | | | | VS: Update v140 flag tables from VS 15 MSBuild filesBrad King2016-09-063-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run cmparseMSBuildXML.py on cl.xml, lib.xml, link.xml, and masm.xml to generate our flag tables: python cmparseMSBuildXML.py -x ".../Common7/IDE/VC/VCTargets/1033/cl.xml" > cmVS14CLFlagTable.h python cmparseMSBuildXML.py -x ".../Common7/IDE/VC/VCTargets/1033/lib.xml" > cmVS14LibFlagTable.h python cmparseMSBuildXML.py -x ".../Common7/IDE/VC/VCTargets/1033/link.xml" > cmVS14LinkFlagTable.h python cmparseMSBuildXML.py -x ".../Common7/IDE/VC/VCTargets/BuildCustomizations/masm.xml" > cmVS14MASMFlagTable.h Manually integrate the changes with those we've made since earlier import to add the new flag mappings.