summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2019-05-261-1/+1
|
* CMake Nightly Date StampKitware Robot2019-05-251-1/+1
|
* Merge topic 'selective-tar-extracting-and-listing'Brad King2019-05-248-13/+121
|\ | | | | | | | | | | | | c8e217e0a7 cmake: tar: Allow selective extracting and listing of archives Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3342
| * cmake: tar: Allow selective extracting and listing of archivesBartosz Kosiorek2019-05-238-13/+121
| |
* | Merge topic 'ninja-pool-link-doc-nit'Brad King2019-05-241-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 25b2c7e4cd Help/CMAKE_JOB_POOL_LINK: match the header line with the variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3369
| * | Help/CMAKE_JOB_POOL_LINK: match the header line with the variableBen Boeckel2019-05-241-1/+1
| | |
* | | Merge topic 'fix-armclang-policy'Brad King2019-05-241-3/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 32e4f236b7 ARMClang: fix policy manipulation in the compiler module Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3365
| * | | ARMClang: fix policy manipulation in the compiler moduleBen Boeckel2019-05-231-3/+5
| | | | | | | | | | | | | | | | | | | | Policies have their own scoping and cannot be set within a function without affecting callers.
* | | | Merge topic 'cmAppend'Brad King2019-05-2460-246/+193
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 006229278b Use cmAppend to append ranges to std::vector instances 999516478d cmAlgorithms: Add cmAppend function Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3366
| * | | | Use cmAppend to append ranges to std::vector instancesSebastian Holtermann2019-05-2359-246/+181
| | | | |
| * | | | cmAlgorithms: Add cmAppend functionSebastian Holtermann2019-05-231-0/+12
| | |_|/ | |/| | | | | | | | | | | | | | The new `cmAppend` function simplifies appending ranges of values to a `std::vector`.
* | | | Merge topic 'cmTargetMap_definition'Brad King2019-05-246-22/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b4b61a4d3 cmMakefile: Define cmTargetMap type in cmMakefile instead of cmTarget Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3364
| * | | | cmMakefile: Define cmTargetMap type in cmMakefile instead of cmTargetSebastian Holtermann2019-05-236-22/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `cmTargetMap` type is only used in the context of `cmMakefile`. Therefore it is the most appropriate place to declare it. This moves the `cmTarget.h/cmTargets` type definition to `cmMakefile::cmTargetMap`.
* | | | | Merge topic 'update-curl'Brad King2019-05-24172-5996/+6571
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90766347db curl: Update build within CMake to account for 7.65 changes a39138ef9a Merge branch 'upstream-curl' into update-curl b26487c663 curl 2019-05-22 (885ce314) 2de8af0121 curl: Update script to get curl 7.65.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3363
| * | | | curl: Update build within CMake to account for 7.65 changesBrad King2019-05-221-2/+5
| | | | |
| * | | | Merge branch 'upstream-curl' into update-curlBrad King2019-05-22171-5993/+6565
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2019-05-22 (885ce314)
| | * | | | curl 2019-05-22 (885ce314)Curl Upstream2019-05-22171-5995/+6567
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 885ce31401b6789c959131754b1e5ae518964072 (curl-7_65_0).
| * | | | | curl: Update script to get curl 7.65.0Brad King2019-05-221-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2019-05-241-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'genex-target-property-lifetime'Brad King2019-05-233-3/+27
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 5a1af142f1 Genex: Fix value lifetimes in nested TARGET_PROPERTY evaluation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3362
| * | | | Genex: Fix value lifetimes in nested TARGET_PROPERTY evaluationBrad King2019-05-223-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For special properties like `INCLUDE_DIRECTORIES`, the pointer returned by `cmTarget::GetProperty` is only valid until the next time the same special property is queried on *any* target. When evaluating a nested `TARGET_PROPERTY` generator expression we may look up such a property more than once on different targets. Fix `TargetPropertyNode::Evaluate` to store the lookup result in locally owned memory earlier. Fixes: #19286
* | | | | Merge topic 'string-error'Brad King2019-05-239-45/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e884b1b693 cmSystemTools::Error(): remove const char* overload Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3360
| * | | | | cmSystemTools::Error(): remove const char* overloadVitaly Stakhovsky2019-05-229-45/+31
| |/ / / /
* | | | | Merge topic 'swift-flag-variables'Brad King2019-05-231-2/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24223ac84b Modules: add Swift MSVC_RUNTIME_LIBRARY flags 7e636fd8e0 Modules: add `CMAKE_Swift_FRAMEWORK_SEARCH_FLAG` 0fbf936b46 Modules: remove `CMAKE_INCLUDE_FLAG_SEP_Swift` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3353
| * | | | | Modules: add Swift MSVC_RUNTIME_LIBRARY flagsSaleem Abdulrasool2019-05-211-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for the newly minted `-libc` flag to the Swift driver invocation. These allow users to control the MSVC linkage properly on Windows targets.
| * | | | | Modules: add `CMAKE_Swift_FRAMEWORK_SEARCH_FLAG`Saleem Abdulrasool2019-05-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Swift supports frameworks and uses them across all OSes. They are added using the `-F` flag. There must be a space following the flag and before the parameter.
| * | | | | Modules: remove `CMAKE_INCLUDE_FLAG_SEP_Swift`Saleem Abdulrasool2019-05-211-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The include flag specifier should be specified multiply. The separator was being misused for adding a space after the `-I` flag. Correct this to get multiple include paths correct.
* | | | | | Merge topic 'compiler-launcher-shell-format'Brad King2019-05-232-4/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ee6584a99 Ninja,Makefile: Fix <LANG>_COMPILER_LAUNCHER shell command syntax Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3361
| * | | | | | Ninja,Makefile: Fix <LANG>_COMPILER_LAUNCHER shell command syntaxBrad King2019-05-222-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first entry in the compiler launcher command argument list is the command itself and should be converted to the shell's native command syntax (e.g. backslashes on Windows). Without this, the `RunCMake.CompilerLauncher` test fails on Windows when there are *no* spaces in the path to `cmake.exe`.
* | | | | | | Merge topic 'FindPython-find_strategy'Brad King2019-05-2310-369/+876
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8517b549f4 FindPython: Add policy to manage lookup stratgey default. 9f205acefe FindPython: Implement lookup strategies. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3354
| * | | | | | | FindPython: Add policy to manage lookup stratgey default.Marc Chevrier2019-05-219-5/+58
| | | | | | | |
| * | | | | | | FindPython: Implement lookup strategies.Marc Chevrier2019-05-215-369/+823
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configration variable Python_FIND_STRATEGY controls the lookup startegy. Possible values are LOCATION and VERSION. Fixes: #19159
* | | | | | | Merge topic 'framework-var'Brad King2019-05-236-6/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26ea022c3b Add variable CMAKE_FRAMEWORK Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3347
| * | | | | | | Add variable CMAKE_FRAMEWORKRuslan Baratov2019-05-216-6/+32
| | | | | | | |
* | | | | | | | Merge topic 'swift-flags'Brad King2019-05-232-4/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 02c14b7fcd Ninja,Swift: pass along DEFINES/FLAGS/INCLUDES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3355
| * | | | | | | | Ninja,Swift: pass along DEFINES/FLAGS/INCLUDESSaleem Abdulrasool2019-05-212-4/+15
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the Swift model does a single compile/link phase, we would not get the compile definitions, includes, and options past along to the build of the module. Compute these for the target when constructing the main command.
* | | | | | | | Merge topic 'cmFileTimes'Brad King2019-05-239-165/+187
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b53cfda24 cmSystemTools: Remove cmSystemToolsFileTime interface 9c576a88d9 Use cmFileTimes instead of cmSystemToolsFileTime interface 4b45a5d5c7 cmFileTimes: New RAII based cmFileTimes class Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3358
| * | | | | | | | cmSystemTools: Remove cmSystemToolsFileTime interfaceSebastian Holtermann2019-05-222-136/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the C style cmSystemToolsFileTime interface in cmSystemTools. It was replaced by the RAII based cmFileTimes class.
| * | | | | | | | Use cmFileTimes instead of cmSystemToolsFileTime interfaceSebastian Holtermann2019-05-223-29/+17
| | | | | | | | |
| * | | | | | | | cmFileTimes: New RAII based cmFileTimes classSebastian Holtermann2019-05-224-0/+170
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new RAII based cmFileTimes class. It is supposed to replace the C style cmSystemToolsFileTime interface.
* | | | | | | | Merge topic 'autogen_compiler_features'Brad King2019-05-235-48/+66
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71d6a1455e Autogen: Evaluate compiler features for the same exectuable only once Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3359
| * | | | | | | Autogen: Evaluate compiler features for the same exectuable only onceSebastian Holtermann2019-05-225-48/+66
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To speed up the `AUTOGEN` configuration process, evaluate the compiler features only once. The feature evaluation result is stored in the new class `cmQtAutoGen::CompilerFeatures`, and the instance is shared by using `std::shared_ptr`.
* | | | | | | CMake Nightly Date StampKitware Robot2019-05-231-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge topic 'default-generator-env'Brad King2019-05-2237-11/+267
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d0f0ba0f7a Tests: Add environment generator tests a48ce8f4bf Help: Add documentation for default generator environment variables 083cf7e8a2 cmake: Allow default generator to be set by environment variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3218
| * | | | | | Tests: Add environment generator testsEicke Herbertz2019-05-2224-0/+128
| | | | | | |
| * | | | | | Help: Add documentation for default generator environment variablesEicke Herbertz2019-05-2211-5/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation for environment variables that control the default generator selection: * CMAKE_GENERATOR * CMAKE_GENERATOR_INSTANCE * CMAKE_GENERATOR_PLATFORM * CMAKE_GENERATOR_TOOLSET
| * | | | | | cmake: Allow default generator to be set by environment variablesEicke Herbertz2019-05-162-6/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there is no Generator available in the Cache, this will read CMAKE_GENERATOR from environment before using the CMake platform default. If CMAKE_GENERATOR is empty, use the platform default. If a environment default generator is specified, subsequent variables CMAKE_GENERATOR_(INSTANCE,PLATFORM,TOOLSET) are also evaluated in the same way.
* | | | | | | Merge topic 'remove_unneeded_device_link_calls'Brad King2019-05-2210-136/+164
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81b4d10d8f CUDA: More exhaustive checks to determine when to do device linking 3205c7c950 cmNinjaLinkLineDeviceComputer now lives in the correct source file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3320
| * | | | | | | CUDA: More exhaustive checks to determine when to do device linkingRobert Maynard2019-05-217-108/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously CMake used fairly naive logic to determine when to do device linking which caused unnecessary device linking to occur frequently. We now use a more exhaustive algorithm to determine when we have a need for device linking. Fixes: #19238
| * | | | | | | cmNinjaLinkLineDeviceComputer now lives in the correct source fileRobert Maynard2019-05-206-34/+57
| | | | | | | |