summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ice-3.6.3'Brad King2016-10-131-0/+1
|\ | | | | | | | | 6e5a3655 FindIce: Add support for version 3.6.3
| * FindIce: Add support for version 3.6.3Roger Leigh2016-10-131-0/+1
| |
* | Merge topic 'msbuild-json'Brad King2016-10-131-0/+453
|\ \ | | | | | | | | | | | | ccdc3d30 Add a script to convert from MSBuild XML to a JSON format
| * | Add a script to convert from MSBuild XML to a JSON formatDon Olmstead2016-10-121-0/+453
| | | | | | | | | | | | | | | | | | This will supersede the `cmparseMSBuildXML.py` script once we have support for loading the JSON files instead of using hard-coded flag tables.
* | | Merge topic 'vs-default-generator'Brad King2016-10-132-48/+60
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5380948f cmake: Fix default VS generator selection for Microsoft Build Tools 1aee54ed cmake: Simplify default generator search by switching direction 24c86e1c cmake: Use array iteration for default generator VS variants 6db64ad4 cmake: Use array iteration for default generator list d3df00ae cmake: Rename default generator selection list variable 10160f69 cmake: Rename default generator selection internal variable 0838d20e cmake: Simplify VS registry entry lookup 8f33de92 cmake: Factor out default generator selection into helper
| * | | cmake: Fix default VS generator selection for Microsoft Build ToolsBrad King2016-10-111-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some versions of the VS tools do not install the registry entry HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\$v;InstallDir but all appear to set HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\$v\Setup\VC;ProductDir Update our search to consider both entries. Closes: #16360
| * | | cmake: Simplify default generator search by switching directionBrad King2016-10-111-12/+10
| | | | | | | | | | | | | | | | Search from newest to oldest and stop once found.
| * | | cmake: Use array iteration for default generator VS variantsBrad King2016-10-111-6/+7
| | | |
| * | | cmake: Use array iteration for default generator listBrad King2016-10-111-5/+5
| | | |
| * | | cmake: Rename default generator selection list variableBrad King2016-10-111-5/+5
| | | |
| * | | cmake: Rename default generator selection internal variableBrad King2016-10-111-4/+3
| | | |
| * | | cmake: Simplify VS registry entry lookupBrad King2016-10-111-4/+6
| | | |
| * | | cmake: Factor out default generator selection into helperBrad King2016-10-112-48/+54
| | | |
* | | | Merge topic 'FindSDL-mingw-mwindows'Brad King2016-10-131-4/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 632326a7 FindSDL: Add -mwindows to link flags for MinGW, correct wording
| * | | | FindSDL: Add -mwindows to link flags for MinGW, correct wordingEmil Laine2016-10-121-4/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `-mwindows` flag is needed to avoid creating an additional console window when starting SDL applications built with MinGW. There is no `mwindows` library. See also https://cygwin.com/ml/cygwin/2007-04/msg00027.html
* | | | Merge topic 'FindProtobuf-debug-suffix'Brad King2016-10-131-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | d9190f33 FindProtobuf: Search for debug library named with `d` suffix
| * | | | FindProtobuf: Search for debug library named with `d` suffixAdam Martin2016-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protobuf now provides a CMake-based build system that optionally adds a suffix to the debug library name [1]. Update our `find_library` call to consider names with the default value for this suffix, `d`. [1] https://github.com/google/protobuf/blob/431cee60/cmake/libprotoc.cmake#L107
* | | | | Merge topic 'remove-obsolete'Brad King2016-10-134-70/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b6a174d2 Makefiles: Remove query for CMAKE_OBJECT_NAME d0faa58a Makefiles: Remove forbidden flag logic
| * | | | | Makefiles: Remove query for CMAKE_OBJECT_NAMEStephen Kelly2016-10-091-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | it is not set.
| * | | | | Makefiles: Remove forbidden flag logicStephen Kelly2016-10-094-67/+0
| | | | | | | | | | | | | | | | | | | | | | | | This might have been needed some day in the past, but not anymore.
* | | | | | 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
| |\ \ \ \
generated by cgit v0.12 at 2025-01-30 06:13:19 (GMT)