summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmLinkLineComputer: Move LinkPath computation from cmLocalGeneratorStephen Kelly2016-10-103-11/+35
| | | | | | | | Add a ConvertToOutputForExisting method which can be made virtual later to satisfy different generator needs. Pass additional strings as parameters for now. They can be turned into class state later.
* cmLinkLineComputer: Move ComputeLinkLibs from cmLocalGeneratorStephen Kelly2016-10-1019-49/+113
| | | | | | | | | | | | | | | Add a cmOutputConverter to the cmLinkLineComputer and factory methods to facilitate shell escapes. Add state to the cmLinkLineComputer to record whether outputting for response files or for watcom, to satisfy the cmOutputConverter API. These are constant for the lifetime of the cmLinkLineComputer, even when its functionality is extended in the future. This also keeps the signatures of cmLinkLineComputer relatively simple. Pass the cmComputeLinkInformation as a method parameter so that cmLinkLineComputer is free from target-specific state. An instance should be usable for all targets in a directory.
* cmLocalGenerator: Move variable to where it is usedStephen Kelly2016-10-101-2/+2
|
* cmLocalGenerator: Use a std::string instead of char*Stephen Kelly2016-10-101-2/+3
|
* cmLocalGenerator: Move stringstream to where it is usedStephen Kelly2016-10-101-1/+1
|
* cmLocalGenerator: Move flag determination up in the functionStephen Kelly2016-10-101-8/+9
| | | | This content is independent of any targets.
* cmLocalGenerator: Separate stdlib content from library streamStephen Kelly2016-10-101-1/+5
|
* cmLocalGenerator: Separate rpath content from library streamStephen Kelly2016-10-101-7/+9
|
* cmLocalGenerator: Pass link library info to OutputLinkLibrariesStephen Kelly2016-10-103-20/+27
| | | | | | | Remove the cmGeneratorTarget from the interface. This is simplification of the OutputLinkLibraries responsibilities so that it can be broken apart into multiple methods.
* Makefiles: Port CreateLinkLibs to cmLinkLineComputerStephen Kelly2016-10-104-13/+20
|
* cmLinkLineComputer: Extract from cmLocalGeneratorStephen Kelly2016-10-1026-79/+282
| | | | | | | | | | | CMake has several classes which have too many responsibilities. cmLocalGenerator is one of them. Start to extract the link line computation. Create generator-specific implementations of the interface to account for generator-specific behavior. Unfortunately MSVC60 has different behavior to everything else and CMake still generates makefiles for it. Isolate it with MSVC60-specific names.
* Ninja: ConstifyStephen Kelly2016-10-102-4/+6
|
* cmLocalGenerator: Inline conversion into link computationStephen Kelly2016-10-101-1/+8
| | | | | Make it possible to invoke this functionality independent of cmLocalGenerator.
* Merge branch 'release'Brad King2016-10-100-0/+0
|\
| * Merge branch 'update-kwsys' into releaseBrad King2016-10-081-11/+9
| |\
| * \ Merge branch 'android-export-has-cpp' into releaseBrad King2016-10-075-1/+22
| |\ \
| * \ \ Merge branch 'FindProtobuf-fix-subdirs' into releaseBrad King2016-10-071-6/+10
| |\ \ \
| * \ \ \ Merge branch 'android-cxxabi' into releaseBrad King2016-10-073-0/+7
| |\ \ \ \
| * \ \ \ \ Merge branch 'check-libuv-minimum-version' into releaseBrad King2016-10-071-2/+6
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'codelite-global-setting' into releaseBrad King2016-10-074-5/+27
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'android-ndk-r13' into releaseBrad King2016-10-062-3/+9
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'cpack-rpm-debuginfo-fixes' into releaseBrad King2016-10-061-28/+40
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'clean-up-link-configuration'Brad King2016-10-108-144/+134
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1cfc4fe cmMakefile: Simplify programmer error to an assert 4079ba20 cmMakefile: Implement LinkLibraries as an internal property 17ab8e33 cmMakefile: Inline method into only remaining caller 7edfcd0e cmMakefile: Inline method into caller 6c8dc7f1 cmake: Simplify find-package mode library addition 1efca9f4 cmMakefile: Remove obsolete parameter d9b5f0a3 cmTarget: Remove target name from parameter list 1c70c6cc cmMakefile: Use public API to find a target 2b7baed7 cmMakefile: Inline method into only caller 7ba95492 cmMakefile: Use public API to find a target 6d98b15f cmMakefile: Invert if() condition to remove else 869037ee cmMakefile: Remove ALIAS check 2f6462a6 cmMakefile: Collapse two consecutive if()s into one 148b83a1 cmMakefile: DeMorgan-invert condition 4457a9f1 cmMakefile: Return after error and remove else condition 4d039c5b cmMakefile: Invert handling of error condition ...
| * | | | | | | | | | cmMakefile: Simplify programmer error to an assertStephen Kelly2016-10-071-8/+3
| | | | | | | | | | |
| * | | | | | | | | | cmMakefile: Implement LinkLibraries as an internal propertyStephen Kelly2016-10-073-39/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmMakefile should not have logic particular to individual cmake commands. The link_libraries() command is generally obsolete in favor of target_link_libraries(). An alternative language for CMake probably would not offer the former. The quirks and historical behaviors of the current language should be separate from the core classes of CMake to allow replacing the language.
| * | | | | | | | | | cmMakefile: Inline method into only remaining callerStephen Kelly2016-10-073-34/+32
| | | | | | | | | | |
| * | | | | | | | | | cmMakefile: Inline method into callerStephen Kelly2016-10-071-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The various uses of AddLinkLibraryForTarget are going away. This is the only remaining non-deprecated use.
| * | | | | | | | | | cmake: Simplify find-package mode library additionStephen Kelly2016-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It does not need the cmMakefile version.
| * | | | | | | | | | cmMakefile: Remove obsolete parameterStephen Kelly2016-10-072-5/+4
| | | | | | | | | | |
| * | | | | | | | | | cmTarget: Remove target name from parameter listStephen Kelly2016-10-073-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the member state instead.
| * | | | | | | | | | cmMakefile: Use public API to find a targetStephen Kelly2016-10-071-3/+3
| | | | | | | | | | |
| * | | | | | | | | | cmMakefile: Inline method into only callerStephen Kelly2016-10-073-16/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmMakefile should not have API which is only useful for deprecated systems like cmPluginAPI.
| * | | | | | | | | | cmMakefile: Use public API to find a targetStephen Kelly2016-10-071-3/+4
| | | | | | | | | | |
| * | | | | | | | | | cmMakefile: Invert if() condition to remove elseStephen Kelly2016-10-071-3/+3
| | | | | | | | | | |
| * | | | | | | | | | cmMakefile: Remove ALIAS checkStephen Kelly2016-10-071-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method is only called from the cmPlugin API, which predates ALIAS targets and is obsolete.
| * | | | | | | | | | cmMakefile: Collapse two consecutive if()s into oneStephen Kelly2016-10-071-14/+11
| | | | | | | | | | |
| * | | | | | | | | | cmMakefile: DeMorgan-invert conditionStephen Kelly2016-10-071-4/+4
| | | | | | | | | | |
| * | | | | | | | | | cmMakefile: Return after error and remove else conditionStephen Kelly2016-10-071-17/+18
| | | | | | | | | | |
| * | | | | | | | | | cmMakefile: Invert handling of error conditionStephen Kelly2016-10-071-6/+6
| | | | | | | | | | |
| * | | | | | | | | | cmMakefile: Remove superfluous overloadStephen Kelly2016-10-073-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicit is better than implicit.
| * | | | | | | | | | cmMakefile: Remove useless link directory containerStephen Kelly2016-10-072-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is never populated - a find will never find anything.
| * | | | | | | | | | cmTarget: Inline MergeLinkLibraries into only callerStephen Kelly2016-10-073-17/+10
| | | | | | | | | | |
| * | | | | | | | | | cmTarget: Remove useless link library stateStephen Kelly2016-10-072-5/+0
| | | | | | | | | | |
| * | | | | | | | | | cmTarget: Remove addition of zero when merging link librariesStephen Kelly2016-10-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The size is always zero when this is called.
| * | | | | | | | | | cmTarget: Add assert about link dataStephen Kelly2016-10-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MergeLinkLibraries is called only from cmMakefile::AddGlobalLinkInformation which is only called immediately after creating a target.
* | | | | | | | | | | Merge topic 'ninja-cleanups'Brad King2016-10-101-6/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc5e6b82 Ninja: Extract identical code from condition d9fde87d Ninja: Replace array access with local variable d92c160d Ninja: Separate two coupled calls
| * | | | | | | | | | | Ninja: Extract identical code from conditionStephen Kelly2016-10-081-3/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Ninja: Replace array access with local variableStephen Kelly2016-10-071-4/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Ninja: Separate two coupled callsStephen Kelly2016-10-071-4/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Merge topic 'minor-cleanups'Brad King2016-10-108-44/+39
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c637e0c5 cmMakefile: Return a string from GetDefineFlags fbc1b75c Test: Remove condition for CMake version no longer supported 3d0e95f6 cmLocalGenerator: Extract definition retrieval out of loop 2a49d86d Makefiles: Inline only use of method b0301db2 Makefiles: Make helper class independent of cmLocalGenerator 267e0209 cmMakefile: Remove pointless condition 009019f2 Makefiles: Extract identical code from condition 378849f4 Makefiles: Replace array access with local variable 4a3c49b4 Makefiles: Separate two coupled calls