summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* cmCoreTryCompile: Factor out config lookup for re-useBrad King2016-04-111-2/+4
| | | | | Store the lookup of CMAKE_TRY_COMPILE_CONFIGURATION in a local variable so we can re-use it.
* Merge topic 'preallocate-condition-keywords'Brad King2016-04-111-4/+4
|\ | | | | | | | | aff4a5fa cmConditionEvaluator: Use pre-allocated keywords in more places
| * cmConditionEvaluator: Use pre-allocated keywords in more placesBrad King2016-04-081-4/+4
| | | | | | | | Inspired-by: Harry Mallon <Harry@codexdigital.com>
* | CMake Nightly Date StampKitware Robot2016-04-111-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-04-101-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-04-091-1/+1
| |
* | Merge topic 'ninja-restat-custom-command-byproducts'Brad King2016-04-081-2/+2
|\ \ | | | | | | | | | | | | | | | add7abc8 Ninja: Restat custom command byproducts even with a SYMBOLIC output (#16049) ff805113 Ninja: Fix detection of custom command symbolic outputs
| * | Ninja: Restat custom command byproducts even with a SYMBOLIC output (#16049)Brad King2016-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.5.0-rc1~198^2 (Ninja: Always re-run custom commands that have symbolic dependencies, 2015-11-19) broke the byproducts feature added by commit v3.2.0-rc1~340^2~2 (Add an option for explicit BYPRODUCTS of custom commands, 2014-11-13) when SYMBOLIC outputs also appear. This case occurs with AUTORCC-generated custom targets because the output is SYMBOLIC (to always run) and the generated file is a byproduct (for restat so dependents do not run unnecessarily). The two use cases conflict because Ninja does not support per-output restat. Favor restat whenever byproducts are present because it is required for byproducts to work correctly. In use cases where we want an always-run chain we simply will not be able to also use byproducts.
| * | Ninja: Fix detection of custom command symbolic outputsBrad King2016-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | Fix logic introduced by commit v3.5.0-rc1~198^2 (Ninja: Always re-run custom commands that have symbolic dependencies, 2015-11-19) to not consider only the last output. We need to know if any output is SYMBOLIC, so stop checking as soon as one is found.
* | | Merge topic 'ninja-object-rsp'Brad King2016-04-085-12/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7731e44f Ninja: Honor CMAKE_NINJA_FORCE_RESPONSE_FILE for compile rules f9644a2d cmGlobalNinjaGenerator: Clarify logic for forcing use of response files 24c9106b cmNinjaTargetGenerator: Factor out helper for forced response file check
| * | | Ninja: Honor CMAKE_NINJA_FORCE_RESPONSE_FILE for compile rulesDmitry Ivanov2016-04-071-4/+24
| | | |
| * | | cmGlobalNinjaGenerator: Clarify logic for forcing use of response filesDmitry Ivanov2016-04-073-5/+6
| | | | | | | | | | | | | | | | | | | | Update the WriteBuild method to use a negative command line length limit to specify that we should force use of response files.
| * | | cmNinjaTargetGenerator: Factor out helper for forced response file checkDmitry Ivanov2016-04-073-3/+10
| | | |
* | | | CMake Nightly Date StampKitware Robot2016-04-081-1/+1
|/ / /
* | | CMake Nightly Date StampKitware Robot2016-04-071-1/+1
| | |
* | | Merge topic 'fortran-line-directives-no-dirs'Brad King2016-04-061-1/+1
|\ \ \ | | | | | | | | | | | | | | | | f831d752 cmFortranParser: Skip #line directives that do not name files
| * | | cmFortranParser: Skip #line directives that do not name filesBrad King2016-04-051-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.5.0-rc1~241^2~1 (cmFortranParser: Parse #line directives, 2015-11-02) our Fortran dependency scanner parses `#line` directives to extract the named files. However, some compilers produce `#line` directives that name directories instead of files. Work around such cases by verifying that the extracted path names a file and not a directory.
* | | CMake Nightly Date StampKitware Robot2016-04-061-1/+1
| | |
* | | Merge topic 'ctest-run-submodule-sync'Brad King2016-04-052-4/+45
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | c18d91ad Help: add release notes for topic 'ctest-run-submodule-sync' 7f560743 cmCTestGIT: run `git submodule sync` before updating submodules 06b310b5 cmCTestGIT: add an option to initialize submodules on update 56c1ea40 cmCTestGIT: fix git version references
| * | | cmCTestGIT: run `git submodule sync` before updating submodulesBen Boeckel2016-04-011-0/+22
| | | | | | | | | | | | | | | | | | | | If the URL of a submodule changes upstream, the commits referenced at the old URL may not be available and will cause an update failure.
| * | | cmCTestGIT: add an option to initialize submodules on updateBen Boeckel2016-04-012-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, CTest will not initialize any submodules within the already checked out source tree. Add an option to do so. The use case for not doing so is that some submodules may not be necessary for the current test and keeping network usage down may be important.
| * | | cmCTestGIT: fix git version referencesBen Boeckel2016-04-011-3/+3
| | | | | | | | | | | | | | | | Git does not use a 4-component version number.
* | | | Merge topic 'cobertura_off_by_one'Brad King2016-04-051-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 398b8800 cmParseCoberturaCoverage: Remove extra coverage line
| * | | | cmParseCoberturaCoverage: Remove extra coverage lineZack Galbreath2016-03-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Fix off-by-one error in cmParseCoberturaCoverage that added an extra blank line to the end of source file being covered.
* | | | | Merge topic 'fix-target-alias-in-subdir'Brad King2016-04-057-33/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0e44f489 Rename local target lookup methods to clarify purpose bc30f8b5 Fix lookup of an ALIAS target outside aliased target's directory (#16044)
| * | | | | Rename local target lookup methods to clarify purposeBrad King2016-04-017-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename methods: * `cmMakefile::Find{ => LocalNonAlias}Target` * `cmLocalGenerator::Find{ => LocalNonAlias}GeneratorTarget` These names clarify that they are for directory-local target names and do not consider alias targets.
| * | | | | Fix lookup of an ALIAS target outside aliased target's directory (#16044)Brad King2016-04-013-27/+3
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.5.0-rc1~272^2~11 (cmTarget: Implement ALIAS in terms of name mapping, 2015-10-25) accidentally introduced logic that assumes ALIAS targets always reference targets in their own directory. Fix this and add a test case. The configure-step fix is that `cmMakefile::FindTarget` should not consider aliases. The purpose of this method is just to look up targets local to a directory. Since ALIAS and normal targets share a namespace we know a locally defined target will never collide with an ALIAS target anyway. The method has 3 call sites, and this change is safe for all of them: * `cmInstallCommand::HandleTargetsMode`: Rejects aliases before the call. * `cmFLTKWrapUICommand::FinalPass`: Should never have considered aliases. * `cmMakefile::FindTargetToUse`: Falls back to a global lookup anyway. The generate-step fix is that `cmLocalGenerator::FindGeneratorTarget` should not consider aliases. This method is the generate-step equivalent to the above. The method has 2 call sites, and this change is safe for both of them: * `cmInstallTargetGenerator::Compute`: Never uses an alias target name. * `cmLocalGenerator::FindGeneratorTargetToUse`: Falls back to global lookup. Reported-by: Matteo Settenvini <matteo@member.fsf.org>
| * | | | CMake 3.5.1v3.5.1Brad King2016-03-241-1/+1
| | | | |
| * | | | Merge branch 'fix-variable_watch-reallocation' into releaseBrad King2016-03-233-10/+19
| |\ \ \ \
| * \ \ \ \ Merge branch 'cpack-osx-optional-CoreServices' into releaseBrad King2016-03-182-1/+20
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'cmake-gui-osx-identifier' into releaseBrad King2016-03-171-0/+1
| |\ \ \ \ \ \
* | | | | | | | CMake Nightly Date StampKitware Robot2016-04-051-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2016-04-041-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2016-04-031-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2016-04-021-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'eclipse-source-groups'Brad King2016-04-012-28/+47
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4828a78c Eclipse: Implement traversal of nested source groups (#15701)
| * | | | | | | | Eclipse: Implement traversal of nested source groups (#15701)Patrik Lehmann2016-03-312-28/+47
| | | | | | | | |
* | | | | | | | | Merge topic 'update-kwsys'Brad King2016-04-011-2/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 168e44e2 Merge branch 'upstream-KWSys' into update-kwsys 731ad172 KWSys 2016-03-31 (3392da1d)
| * | | | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-03-311-2/+3
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-03-31 (3392da1d)
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-04-011-1/+1
|/ / / / / / / /
* | | | | | | | Merge topic 'fix-spelling-typos'Brad King2016-03-3115-20/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 49e82c15 Fix spelling typos in comments and documentation (#16037)
| * | | | | | | | Fix spelling typos in comments and documentation (#16037)Felix Geyer2016-03-2915-20/+20
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Debian package checker tool (lintian) detected several typos in CMake.
* | | | | | | | Merge topic 'update-kwsys'Brad King2016-03-314-8/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc333a71 Merge branch 'upstream-KWSys' into update-kwsys 735c41dd KWSys 2016-03-29 (b51abb30)
| * | | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-03-294-8/+8
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-03-29 (b51abb30)
* | | | | | | | Merge topic 'preallocate-condition-keywords'Brad King2016-03-311-31/+58
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 5c324294 cmConditionEvaluator: Pre-allocate keyword strings
| * | | | | | | cmConditionEvaluator: Pre-allocate keyword stringsBrad King2016-03-291-31/+58
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calls to `IsKeyword("...")` cause runtime construction of std::string. Avoid possible repeated allocation by pre-allocating keyword strings during initialization.
* | | | | | | Merge topic 'simplify-condition-context'Brad King2016-03-314-28/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2379b3ae cmConditionEvaluator: Remove GetConditionContext method 02fce523 cmConditionEvaluator: Drop unnecessary path conversion
| * | | | | | | cmConditionEvaluator: Remove GetConditionContext methodBrad King2016-03-294-21/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All it does is call cmListFileContext::FromCommandContext, so move this to the call sites.
| * | | | | | | cmConditionEvaluator: Drop unnecessary path conversionBrad King2016-03-291-8/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.4.0-rc2~1^2 (cmIfCommand: Issue CMP0054 warning with appropriate context, 2015-10-20) we added construction of a cmListFileContext with conversion of the calling file path. This code path runs on every condition (e.g. `if()`) and so the path conversion has a noticeable performance cost. Fortunately the only use of this context is for insertion into cmMakefile::CMP0054ReportedIds so we do not need to convert the path. Simply drop the conversion.
* | | | | | | Merge topic 'vs-fortran-MP'Brad King2016-03-311-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 729f5f01 VS: Map Intel Fortran `/MP` flag for multi-processor compilation (#15990)