summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
| | | | | | |
* | | | | | | Merge topic 'find-package-prefer-config'Brad King2019-05-2210-51/+155
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26a99da206 find_package: Add option to prefer Config mode c365243a3a find_package: Factor out module and config find_package methods Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ruslan Baratov <ruslan_baratov@yahoo.com> Merge-request: !3339
| * | | | | | | find_package: Add option to prefer Config modeCristian Adam2019-05-219-43/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `CMAKE_FIND_PACKAGE_PREFER_CONFIG` variable to tell `find_package` calls to look for a package configuration file first even if a find module is available. Fixes: #16805, #19236
| * | | | | | | find_package: Factor out module and config find_package methodsCristian Adam2019-05-202-50/+63
| | | | | | | |
* | | | | | | | Merge topic 'swift-debug-variant'Brad King2019-05-221-13/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62381effba Ninja,Swift: reuse `SWIFT_MODULE_NAME` for `SWIFT_MODULE` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3343
| * | | | | | | | Ninja,Swift: reuse `SWIFT_MODULE_NAME` for `SWIFT_MODULE`Saleem Abdulrasool2019-05-201-13/+10
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than compute the value of `SWIFT_MODULE`, use the computed value of `SWIFT_MODULE_NAME`. This is helpful strictly for Windows where you have multiple configuration variants with differing ABIs that need must co-exist. In particular, this re-use permits the use of `CMAKE_DEBUG_POSTFIX` to have the import library and the DLL be named with the trailing suffix but have the same import name for the swift module and interface.
* | | | | | | | Merge topic 'vs-ApplicationTypeRevision'Brad King2019-05-224-12/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c07cefee5 VS: Fix ApplicationTypeRevision in builtin check projects 639e14def6 VS: Factor out helper to compute ApplicationTypeRevision Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3350
| * | | | | | | | VS: Fix ApplicationTypeRevision in builtin check projectsBrad King2019-05-212-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use the entire `CMAKE_SYSTEM_VERSION`, but rather the first two components only. Fixes: #19275
| * | | | | | | | VS: Factor out helper to compute ApplicationTypeRevisionBrad King2019-05-213-8/+20
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This is the first two components of `CMAKE_SYSTEM_VERSION`.
* | | | | | | | Merge topic 'compiler-id-arch-only-iar'Brad King2019-05-222-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c0fb923b7 IAR: Do not print compiler architecture id for non-IAR compilers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3352
| * | | | | | | | IAR: Do not print compiler architecture id for non-IAR compilersBrad King2019-05-212-2/+2
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compiler identification message was modified in commit ea83d0f8fb (IAR: Generalize and add support for IAR RX compiler, 2019-04-05) to include the architecture id since IAR compilers are arch-specific. Revise the logic to avoid modifying the message for other compilers.
* | | | | | | | Merge topic 'ninja-lib-symlink-space'Brad King2019-05-221-1/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13c92b4a30 Ninja: Fix creation of library symlinks in folders with spaces Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3341
| * | | | | | | Ninja: Fix creation of library symlinks in folders with spacesEike Ziller2019-05-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The arguments to 'cmake -E cmake_symlink_library' must be properly quoted.
* | | | | | | | Merge branch 'release-3.14'Brad King2019-05-220-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'libarchive-solaris-11.4' into release-3.14Brad King2019-05-211-5/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3351
* | \ \ \ \ \ \ \ \ Merge topic 'libarchive-solaris-11.4'Brad King2019-05-221-5/+5
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c81c6538b libarchive: avoid b64_encode name conflict with Solaris built-in function Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3351
| * | | | | | | | | libarchive: avoid b64_encode name conflict with Solaris built-in functionBrad King2019-05-211-5/+5
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solaris 11.4 has a built-in function named `b64_encode`. Add a `la_` prefix to our internal function to avoid conflict. Fixes: #19268
* | | | | | | | | Merge topic 'file-remove-no-empty'Craig Scott2019-05-226-1/+29
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1eb03569d file: Change REMOVE to ignore empty names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3349