summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmTarget: Extract GetSources methodStephen Kelly2016-10-151-83/+92
|
* cmTarget: Extract location computation methodsStephen Kelly2016-10-151-54/+44
|
* cmTarget: Split property computation into separate classStephen Kelly2016-10-152-54/+78
| | | | | Everything related to property computation will be moved here and eventually shared with cmGeneratorTarget.
* cmTarget: Move IMPORTED check to callersStephen Kelly2016-10-151-6/+7
| | | | This way the policy can be checked without depending on cmTarget.
* cmTarget: Move SOURCES property computation before the restStephen Kelly2016-10-151-85/+85
| | | | The SOURCES have to be computed.
* cmTarget: Remove mutable marker from propertiesStephen Kelly2016-10-152-3/+3
|
* cmTarget: Use static storage for computed propertiesStephen Kelly2016-10-151-12/+21
| | | | Avoid having to populate a mutable container to return a value.
* Merge branch 'release'Brad King2016-10-140-0/+0
|\
| * Merge branch 'ninja-framework-POST_BUILD' into releaseBrad King2016-10-132-2/+9
| |\
| * \ Merge branch 'backport-LINK_WHAT_YOU_USE-allow-OFF' into releaseBrad King2016-10-133-6/+6
| |\ \
| * \ \ Merge branch 'ninja-rc-regression' into releaseBrad King2016-10-131-1/+1
| |\ \ \
| * \ \ \ Merge branch 'ice-3.6.3' into releaseBrad King2016-10-131-0/+1
| |\ \ \ \
* | \ \ \ \ Merge topic 'vs-host-x64-tools'Brad King2016-10-1429-7/+209
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d079e71c VS: Provide an option to use x64 host tools 779939a0 Help: Document VS and Xcode toolset selection
| * | | | | | VS: Provide an option to use x64 host toolsBrad King2016-10-1425-1/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio provides toolchains that are themselves built for 32-bit or 64-bit host architectures. By default it uses the 32-bit tools, but it can be told to prefer the 64-bit tools on 64-bit hosts. Extend the `CMAKE_GENERATOR_TOOLSET` specification to provide a way to request use of the 64-bit host tools. Closes: #15622
| * | | | | | Help: Document VS and Xcode toolset selectionBrad King2016-10-137-6/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add explicit sections to the individual generator documentation to cover the `cmake -T` option along with the default behavior for each generator.
* | | | | | | Merge topic 'flush-archive-list'Brad King2016-10-141-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39b08858 cmSystemTools: Flush output buffer for list_item_verbose
| * | | | | | | cmSystemTools: Flush output buffer for list_item_verboseDāvis Mosāns2016-10-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `std::cout` and `FILE *stdout` are used at same time need to explicitly flush otherwise they can be out of sync.
* | | | | | | | Merge topic 'FindBoost-minor-cleanup'Brad King2016-10-141-13/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08b9a0fd FindBoost: Simplify library dir detection with cascading if/elseif/else ca4029fa FindBoost: Minor style updates 2e242b5c FindBoost: Use list(INSERT) to simplify suffix list generation 6699d46a FindBoost: Use string(APPEND) in more cases
| * | | | | | | | FindBoost: Simplify library dir detection with cascading if/elseif/elseAlex Turbov2016-10-131-6/+4
| | | | | | | | |
| * | | | | | | | FindBoost: Minor style updatesAlex Turbov2016-10-131-2/+2
| | | | | | | | |
| * | | | | | | | FindBoost: Use list(INSERT) to simplify suffix list generationAlex Turbov2016-10-131-1/+1
| | | | | | | | |
| * | | | | | | | FindBoost: Use string(APPEND) in more casesAlex Turbov2016-10-131-4/+4
| | | | | | | | |
* | | | | | | | | Merge topic 'st2-exclude-patterns-variable'Brad King2016-10-145-2/+26
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19ffc072 Sublime: Exclude build tree from source tree project only optionally
| * | | | | | | | | Sublime: Exclude build tree from source tree project only optionallyBruno Pedrosa2016-10-125-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a `CMAKE_SUBLIME_TEXT_2_EXCLUDE_BUILD_TREE` variable to control addition of the build tree to `folder_exclude_patterns` in the `.sublime-project`. Change the default of this behavior to OFF. Closes: #16351
* | | | | | | | | | Merge topic 'ninja-framework-POST_BUILD'Brad King2016-10-142-2/+9
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 20278872 Ninja: Fix POST_BUILD commands on macOS Frameworks
| * | | | | | | | | Ninja: Fix POST_BUILD commands on macOS FrameworksBrad King2016-10-132-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The condition added by commit v2.8.12~179^2 (OS X: Fix regression handling frameworks for Ninja, 2013-07-16) for excluding use of versioning symlinks on macOS Frameworks must match that used for POST_BUILD selection. Otherwise we place the POST_BUILD commands after a symlink step that is never added. Closes: #16363
* | | | | | | | | | Merge topic 'ninja-rc-regression'Brad King2016-10-141-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 9977899d Ninja: Fix RC language depfile generation with cmcldeps
| * | | | | | | | | Ninja: Fix RC language depfile generation with cmcldepsBen Boeckel2016-10-131-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.7.0-rc1~275^2 (Ninja: Use full path for all source files, 2016-08-05), the source path was changed to use an absolute path. Inside of `cmcldeps` for `.rc` file compilation, it uses a separate argument for the path to the source file. This ended up causing `cmcldeps` to transform the following call: cmcldeps.exe RC source.rc ... C:/full/path/to/source.rc into: ... C:/full/path/to//Tc source.rc which is invalid. Update the source filename to use the full path to the source file so that the path is replaced properly.
* | | | | | | | | Merge topic 'LINK_WHAT_YOU_USE-allow-OFF'Brad King2016-10-143-6/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2f79b22c Merge branch 'backport-LINK_WHAT_YOU_USE-allow-OFF' into LINK_WHAT_YOU_USE-allow-OFF 33cb0173 Honor LINK_WHAT_YOU_USE when set to OFF 933e54d3 Honor LINK_WHAT_YOU_USE when set to OFF
| * \ \ \ \ \ \ \ \ Merge branch 'backport-LINK_WHAT_YOU_USE-allow-OFF' into ↵Brad King2016-10-130-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | LINK_WHAT_YOU_USE-allow-OFF
| | * | | | | | | | Honor LINK_WHAT_YOU_USE when set to OFFJamie Snape2016-10-133-6/+6
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly setting variable CMAKE_LINK_WHAT_YOU_USE or property LINK_WHAT_YOU_USE to OFF should not cause LWYU to run. Fix the property lookup to use GetPropertyAsBool.
| * | | | | | | | Honor LINK_WHAT_YOU_USE when set to OFFJamie Snape2016-10-133-6/+6
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly setting variable CMAKE_LINK_WHAT_YOU_USE or property LINK_WHAT_YOU_USE to OFF should not cause LWYU to run. Fix the property lookup to use GetPropertyAsBool.
* | | | | | | | CMake Nightly Date StampKitware Robot2016-10-141-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'release'Brad King2016-10-130-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge branch 'cmake-gui-fix-extra-generator-names' into releaseBrad King2016-10-111-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ExternalProject-fix-CMAKE_CACHE_ARGS-list' into releaseBrad King2016-10-105-3/+25
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'vs15-separate-flag-table' into releaseBrad King2016-10-103-3/+247
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ 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
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |