summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'exclude_from_all'Brad King2019-01-2514-29/+92
|\ | | | | | | | | | | | | 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-2114-29/+92
| | | | | | | | | | | | 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 'FindICU-win64'Brad King2019-01-251-3/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 26b7a8e77e FindICU: Find 64-bit Windows builds under CMP0074 NEW behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2859
| * | | FindICU: Find 64-bit Windows builds under CMP0074 NEW behaviorJohannes Reiff2019-01-241-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | CMP0074 causes FindICU.cmake to always prefer the 32-bit version of ICU programs/libraries on Windows. NO_PACKAGE_ROOT_PATH reverts this behavior. Fixes: #18742
* | | | 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)
| | * | | | | KWSys 2019-01-24 (b9dd1636)KWSys Upstream2019-01-244-5/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit b9dd1636e50ea43cd33bed8c6ffbbe7161618b54 (master). Upstream Shortlog ----------------- Ben Boeckel (1): 28db6989 cmake: add an option for building with PIC Taylor Braun-Jones (1): 3f35954d SystemTools: Add TextFilesDiffer method Tobias Kloss (1): aa1f7f7c SystemTools: Fix FileIsSymlink with Windows data deduplication
* | | | | | | 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 branch 'release-3.13'Brad King2019-01-250-0/+0
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'revert-file-alt-httpauth' into release-3.13Brad King2019-01-241-8/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2858
* | \ \ \ \ \ \ \ \ \ \ 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
* | | | | | | | | | | | 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.
* | | | | | | | | | | | | Merge topic 'FindPython-numpy'Marc Chevrier2019-01-2510-70/+268
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 513e77550d FindPython: Introduce NumPy component Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2734
| * | | | | | | | | | | | | FindPython: Introduce NumPy componentHiroshi Miura2019-01-2410-70/+268
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18678 Signed-off-by: Hiroshi Miura <miurahr@linux.com>
* | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2019-01-251-1/+1
| |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'fortran-docs'Brad King2019-01-242-4/+28
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3d63d3ce2f Help: Add examples to CheckFortranSource{Runs,Compiles} Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2843
| * | | | | | | | | | | Help: Add examples to CheckFortranSource{Runs,Compiles}Michael Hirsch, Ph.D2019-01-232-4/+28
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge topic 'findgit-note'Marc Chevrier2019-01-241-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f2d7ed1cda Help: Add note about CMAKE_ROLE to FindGit documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2847
| * | | | | | | | | | | Help: Add note about CMAKE_ROLE to FindGit documentationKyle Edwards2019-01-231-1/+2
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge topic 'findpython-script'Marc Chevrier2019-01-249-113/+166
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e4541b0e3d FindPython: Support script mode 8ef1916c82 FindPython: Test existence of imported targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2844
| * | | | | | | | | | FindPython: Support script modeKyle Edwards2019-01-239-113/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18827
| * | | | | | | | | | FindPython: Test existence of imported targetsKyle Edwards2019-01-233-0/+24
| |/ / / / / / / / /
* | | | | | | | | | CMake Nightly Date StampKitware Robot2019-01-241-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge topic 'tidy-pass-by-value'Brad King2019-01-2374-257/+265
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a0784ddea clang-tidy: Pass by value Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2836
| * | | | | | | | clang-tidy: Pass by valueRegina Pfeifer2019-01-2274-257/+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)
| | * | | | | | KWSys 2019-01-22 (4fecfe6f)KWSys Upstream2019-01-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 4fecfe6f29be07ec165bcc87a20666425d928aa6 (master). Upstream Shortlog ----------------- Brad King (1): 7a5e5af8 SystemTools: Revert "Fix FileIsSymlink with Windows data deduplication" Tobias Kloss (1): ef373416 SystemTools: Fix FileIsSymlink with Windows data deduplication Wouter Klouwen (1): 8e9970fb SystemInformation: support BSD platforms for GetProcessId
* | | | | | | | 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-2310-19/+57
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2210-19/+61
| | | | | | | | | |
| * | | | | | | | | Tests: Remove unused files from RunCMake.CommandLine testBrad King2019-01-224-4/+0
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop `-stderr.txt` files for cases that do not exist.
* | | | | | | | | Merge branch 'release-3.13'Brad King2019-01-230-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge branch 'backport-cmake-warn-no-src-build-dir' into release-3.13Brad King2019-01-225-5/+46
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | Merge-request: !2839
* | | | | | | | | Merge topic 'cmake-warn-no-src-build-dir'Brad King2019-01-235-5/+46
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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