summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'exclude_from_all'Brad King2019-01-258-29/+15
|\ | | | | | | | | | | | | dc6888573d Pass EXCLUDE_FROM_ALL from directory to targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2816
| * Pass EXCLUDE_FROM_ALL from directory to targetsZack Galbreath2019-01-218-29/+15
| | | | | | | | | | | | When a target is created it now inherits the EXCLUDE_FROM_ALL property from its directory. This change makes it possible to include a target in "all", even if its directory has been marked as EXCLUDE_FROM_ALL.
* | Merge topic 'swift'Brad King2019-01-251-1/+6
|\ \ | | | | | | | | | | | | | | | | | | de13c55d74 Ninja: support `SWIFT_MODULE_NAME` property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2850
| * | Ninja: support `SWIFT_MODULE_NAME` propertySaleem Abdulrasool2019-01-241-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Add a new `SWIFT_MODULE_NAME` property that defaults to the target name. This can be adjusted via `set_target_properties`. This is needed as otherwise, the first source file determines the module name. Issue: #18800
* | | Merge topic 'clang-warnings'Brad King2019-01-252-4/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | c3203bf316 Silence -Wcomma warning 68eabb3576 Avoid -Wstring-plus-int warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2846
| * | | Silence -Wcomma warningBrad King2019-01-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We use a comma-in-paren expression to evaluate multiple statements in a condition. Clang warns that this may be incorrect. Follow its suggestion to cast all but the last expression to `void` to silence the warning.
| * | | Avoid -Wstring-plus-int warningBrad King2019-01-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In `cmState::GetGlobalProperty` we use a macro to produce a string of the form ";a;b;c" and want to return "a;b;c" by skipping the leading ";". Switch from pointer arithmetic to indexing+addressing to silence the "warning: adding 'int' to a string does not append to the string" diagnostic from Clang.
* | | | Merge topic 'update-kwsys'Brad King2019-01-254-5/+114
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d67ce0a61e Merge branch 'upstream-KWSys' into update-kwsys bee32e96b3 KWSys 2019-01-24 (b9dd1636) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2851
| * | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2019-01-244-5/+114
| | |/ / | |/| | | | | | | | | | | | | | * upstream-KWSys: KWSys 2019-01-24 (b9dd1636)
* | | | Merge topic 'cmake-files-directory'Brad King2019-01-2528-85/+62
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e867ed400 cmake: inlined files dir constant and removed it from cmake.h Acked-by: Kitware Robot <kwrobot@kitware.com> Rejected-by: vvs31415 <vstakhovsky@fastmail.com> Merge-request: !2655
| * | | | cmake: inlined files dir constant and removed it from cmake.hBruno Manganelli2019-01-2128-85/+62
| | | | |
* | | | | Merge topic 'renamefile-string'Brad King2019-01-259-22/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e5c13738b cmSystemTools::RenameFile: Accepts std::string args Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2842
| * | | | | cmSystemTools::RenameFile: Accepts std::string argsVitaly Stakhovsky2019-01-239-22/+25
| | | | | |
* | | | | | Merge topic 'error-overloads'Brad King2019-01-2523-54/+62
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99337d345b cmSystemTools::Error(): new overload accepting std::string Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2845
| * | | | | | cmSystemTools::Error(): new overload accepting std::stringVitaly Stakhovsky2019-01-2323-54/+62
| | |_|_|/ / | |/| | | |
* | | | | | Merge topic 'unixmfg3-string'Brad King2019-01-256-63/+45
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 614876c638 cmLocalUnixMakefileGenerator3: more methods accept std::string Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2840
| * | | | | | cmLocalUnixMakefileGenerator3: more methods accept std::stringVitaly Stakhovsky2019-01-226-63/+45
| | | | | | |
* | | | | | | Merge topic 'revert-file-alt-httpauth'Brad King2019-01-251-8/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 646eedcfcb Revert "file: Allow DOWNLOAD/UPLOAD using alternate authentication methods" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2858
| * | | | | | | Revert "file: Allow DOWNLOAD/UPLOAD using alternate authentication methods"Brad King2019-01-241-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 31301b46a7 (file: Allow DOWNLOAD/UPLOAD using alternate authentication methods, 2018-08-28, v3.13.0-rc1~155^2). It regressed support for password-protected redirects. Fixes: #18691
| * | | | | | | CMake 3.13.3v3.13.3Brad King2019-01-141-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'cmake-option-parsing' into release-3.13Brad King2019-01-143-16/+22
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2799
| * | | | | | | | Autogen: Issue a warning when AUTOMOC/UIC/RCC gets disabled.Sebastian Holtermann2019-01-101-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to silently disable AUTOMOC/UIC/RCC when no valid Qt version was found. This patch introduces the generation of a warning message in that case. Closes #18732.
* | | | | | | | | Merge topic 'aarch64-no-std-move-function'Brad King2019-01-251-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8f56f22b84 cmListCommand: Avoid std::function move constructor on aarch64 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2857
| * | | | | | | | | cmListCommand: Avoid std::function move constructor on aarch64Brad King2019-01-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 5a0784ddea (clang-tidy: Pass by value, 2019-01-21), some of the `RunCMake.{list,PositionIndependentCode}` cases have crashed on an aarch64 build with GCC 6. Avoiding use of the `std::function` move constructor avoids the crash. Use a strict preprocessor condition to use this workaround only where needed.
* | | | | | | | | | CMake Nightly Date StampKitware Robot2019-01-251-1/+1
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2019-01-241-1/+1
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge topic 'tidy-pass-by-value'Brad King2019-01-2373-256/+265
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a0784ddea clang-tidy: Pass by value Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2836
| * | | | | | | clang-tidy: Pass by valueRegina Pfeifer2019-01-2273-256/+265
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge topic 'update-kwsys'Brad King2019-01-231-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 405d9cb4b5 Merge branch 'upstream-KWSys' into update-kwsys 3068a0d0dc KWSys 2019-01-22 (4fecfe6f) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2833
| * | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2019-01-221-1/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2019-01-22 (4fecfe6f)
* | | | | | | Merge topic 'getmodulesfile-string'Brad King2019-01-236-25/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2993fc347a cmMakefile: GetModulesFile() accepts std::string param Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2838
| * | | | | | | cmMakefile: GetModulesFile() accepts std::string paramVitaly Stakhovsky2019-01-216-25/+20
| | | | | | | |
* | | | | | | | Merge topic 'cmake_build_jobs_supports_no_space'Brad King2019-01-231-19/+36
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f2fca92686 cmake: --build supports '-jN' e463133cd2 Tests: Remove unused files from RunCMake.CommandLine test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2819
| * | | | | | | | cmake: --build supports '-jN'Robert Maynard2019-01-221-19/+36
| |/ / / / / / /
* | | | | | | | Merge topic 'cmake-warn-no-src-build-dir'Brad King2019-01-231-2/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20861d758b Merge branch 'backport-cmake-warn-no-src-build-dir' 68b51fb19a cmake: Convert no source/build dir error to warning 6b85eea365 Help: Add 3.13.4 release note for no source/build dir error/warning 2395b1b244 cmake: Convert no source/build dir error to warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2839
| * | | | | | | | cmake: Convert no source/build dir error to warningCraig Scott2019-01-221-2/+5
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporarily restore previous behavior that allowed specifying no source or build directory to work, even though it was neither documented nor supported. This commit is expected to eventually be reverted to restore the fatal error for such cases. Relates: #18817
* | | | | | | | CMake Nightly Date StampKitware Robot2019-01-231-1/+1
|/ / / / / / /
* | | | | | | Merge topic 'implicit-includes'Brad King2019-01-222-9/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5990ecb741 Compute implicit include directories from compiler output d751d2d2ed CMakeDetermineCompilerABI: set locale to C for try_compile() c765ae495a CMakeDetermineCompilerABI: pass verbose flag during compilation 8c5221fb1f try_compile: Preserve special characters in COMPILE_DEFINITIONS 15ad830062 Refactor exclusion of -I/usr/include to avoid per-language values Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2716
| * | | | | | | try_compile: Preserve special characters in COMPILE_DEFINITIONSBrad King2019-01-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating the `CMakeLists.txt` file, we pass the values given to our `COMPILE_DEFINITIONS` option in an `add_definitions` call. Pass them as bracket arguments to preserve special characters like `#`.
| * | | | | | | Refactor exclusion of -I/usr/include to avoid per-language valuesBrad King2019-01-211-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES` to contain the hard-coded list of paths to be excluded from `-I` arguments so that the values remain excluded even if the per-language `CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES` variants change. This is needed to preserve our historical exclusion of `-I/usr/include` even when it is not a real implicit include directory. A policy may be needed to remove it later.
* | | | | | | | Merge topic 'help-mark-default-generator'Brad King2019-01-228-22/+64
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dfd5ae7da7 Help: Mark default CMake generator with asterisk 6023fe7ff2 ccmake: Append rather than replace Generators section of docs 7408cd3929 cmake: Return generator docs directly Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2682
| * | | | | | | Help: Mark default CMake generator with asteriskArtur Ryt2019-01-185-8/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Required extracting default generator evaluation to explicit function, as Visual Studio generators get validated during their construction. Fixes: #18544
| * | | | | | | ccmake: Append rather than replace Generators section of docsCraig Scott2019-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using SetSection() discards the heading line populated by addCMakeStandardDocSections(), whereas AppendSection() preserves it. This also makes the code used for ccmake consistent with that used for cmake and cmake-gui.
| * | | | | | | cmake: Return generator docs directlyArtur Ryt2019-01-185-13/+25
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GetGeneratorDocumentation() function was not accurately named and required the vector to populate to be passed as a function argument. This commit makes the slightly renamed function return by value, making it a true getter as implied by its name. Some minor refactoring of the implementation also makes the steps of populating the vector clearer.
* | | | | | | Merge topic 'crosscompiling_emulator-fix'Brad King2019-01-221-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab3b549ee0 CROSSCOMPILING_EMULATOR: Fix test generation for empty value Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2834
| * | | | | | | CROSSCOMPILING_EMULATOR: Fix test generation for empty valueKyle Edwards2019-01-211-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If CROSSCOMPILING_EMULATOR was set to an empty string, and a test was generated with the executable as the command, CMake would segfault upon trying to generate the test file. Fix this. Fixes: #18819
* | | | | | | Merge topic 'Wcomma'Brad King2019-01-225-11/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ff7fb592e Fixed all but one clang -Wcomma warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2828
| * | | | | | | Fixed all but one clang -Wcomma warningSean McBride2019-01-125-11/+13
| | | | | | | |
* | | | | | | | Merge topic 'stdout-string'Brad King2019-01-229-56/+42
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3132ea801c cmSystemTools: Stdout(),Stderr() accept std::string argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2829
| * | | | | | | | cmSystemTools: Stdout(),Stderr() accept std::string argumentVitaly Stakhovsky2019-01-209-56/+42
| | | | | | | | |