summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ExternalProject-fix-CMAKE_CACHE_ARGS-list'Brad King2016-10-135-3/+25
|\ | | | | | | | | a3c98cb3 ExternalProject: Fix regression in passing list to CMAKE_CACHE_ARGS
| * ExternalProject: Fix regression in passing list to CMAKE_CACHE_ARGSMax Smolens2016-10-105-3/+25
| | | | | | | | | | | | | | | | | | | | Fix passing a list to the CMAKE_CACHE_ARGS and CMAKE_CACHE_DEFAULT_ARGS options of ExternalProject_Add. Following commit v3.7.0-rc1~273^2~1 (prefer list(APPEND) over string(APPEND) where appropriate, 2016-08-08), the semicolon list separator after the first list element was missing in the generated cache.
* | Merge topic 'vs15-separate-flag-table'Brad King2016-10-133-3/+247
|\ \ | | | | | | | | | | | | b1d67ae8 VS: Split flag table between v140 and v141 toolsets
| * | VS: Split flag table between v140 and v141 toolsetsBrad King2016-10-103-3/+247
| |/ | | | | | | | | | | | | | | | | | | | | | | In commit v3.7.0-rc1~156^2~1 (VS: Update v140 flag tables from VS 15 MSBuild files, 2016-09-02) we extended the v140 flag table with values from the v141 toolset that comes with VS 15. However, the v140 toolset that comes with VS 14 does not have all of these entries and so the flags just need to be passed without special mapping. In order to support both toolsets, split our CL flag table into separate copies for each version and switch off the toolset name. Closes: #16352
* | Merge topic 'cmake-gui-fix-extra-generator-names'Brad King2016-10-131-1/+1
|\ \ | | | | | | | | | | | | bf86012a cmake-gui: Fix "extra" generator entries in drop-down list
| * | cmake-gui: Fix "extra" generator entries in drop-down listBrad King2016-10-111-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.7.0-rc1~291^2~1 (Refactor extra generator registration to use factories, 2016-07-20) accidentally switched the order of the "extra - base" generator names to "base - extra". Switch it back. While this could affect all callers of the `GetRegisteredGenerators` method, only cmake-gui actually used this particular field. Closes: #16359
* | CMake Nightly Date StampKitware Robot2016-10-131-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-10-121-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-10-111-1/+1
| |
* | Merge topic 'extract-cmLinkLineComputer'Brad King2016-10-1026-183/+527
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41340304 cmLinkLineComputer: Extract link libraries computation from cmLocalGenerator f03d446e cmLinkLineComputer: Move FrameworkPath computation from cmLocalGenerator 3444105f cmLocalGenerator: Inline last use of local variable 77c4202e cmLinkLineComputer: Move RPath computation from cmLocalGenerator 09b6cc66 cmLinkLineComputer: Move LinkPath computation from cmLocalGenerator 0c978063 cmLinkLineComputer: Move ComputeLinkLibs from cmLocalGenerator 0152a01f cmLocalGenerator: Move variable to where it is used 011e6870 cmLocalGenerator: Use a std::string instead of char* cbca80f3 cmLocalGenerator: Move stringstream to where it is used d48f69d0 cmLocalGenerator: Move flag determination up in the function ff8e321c cmLocalGenerator: Separate stdlib content from library stream 80f57e67 cmLocalGenerator: Separate rpath content from library stream 7ef83468 cmLocalGenerator: Pass link library info to OutputLinkLibraries 69295812 Makefiles: Port CreateLinkLibs to cmLinkLineComputer 5b361fdd cmLinkLineComputer: Extract from cmLocalGenerator 2e5d1990 Ninja: Constify ...
| * | cmLinkLineComputer: Extract link libraries computation from cmLocalGeneratorStephen Kelly2016-10-105-34/+37
| | | | | | | | | | | | Hide some methods which no longer need to be public.
| * | cmLinkLineComputer: Move FrameworkPath computation from cmLocalGeneratorStephen Kelly2016-10-1012-34/+39
| | | | | | | | | | | | Add UseWatcomQuote state, and remove corresponding method parameters.
| * | cmLocalGenerator: Inline last use of local variableStephen Kelly2016-10-101-3/+1
| | |
| * | cmLinkLineComputer: Move RPath computation from cmLocalGeneratorStephen Kelly2016-10-108-36/+52
| | | | | | | | | | | | | | | | | | Add state for Relink and populate it at the point of cmLinkLineComputer initialization. This allows removal of the parameter in go-between methods.
| * | 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
| | | | | | | | | | | |
generated by cgit v0.12 at 2025-01-19 15:29:31 (GMT)