summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * \ \ \ \ \ \ \ Merge branch 'backport-cmake-warn-no-src-build-dir'Brad King2019-01-221-0/+26
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Help: Add 3.13.4 release note for no source/build dir error/warningCraig Scott2019-01-221-0/+26
| | | | | | | | |
| | * | | | | | | cmake: Convert no source/build dir error to warningCraig Scott2019-01-224-5/+20
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Convert no source/build dir error to warningCraig Scott2019-01-224-5/+20
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2265-9/+1721
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Compute implicit include directories from compiler outputChuck Cranor2019-01-2161-0/+1671
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - CMakeParseImplicitIncludeInfo.cmake: new parser that extracts the compiler's include path from verbose output. If the parser cannot parse the output, we fall back to the old behavior. On osx we skip over framework directories (handled elsewhere). - CMakeDetermineCompilerABI.cmake: - use verbose flag in try_compile for ${src} - use new cmake_parse_implicit_include_info() to attempt extract implicit include directory path and if successful set CMAKE_${LANG}_IMPLICIT_INCLUDE_DIRECTORIES - CMakeCCompiler.cmake.in and CMakeCXXCompiler.cmake.in - preserve CMAKE_${LANG}_IMPLICIT_INCLUDE_DIRECTORIES value between runs in the same way CMAKE_${LANG}_IMPLICIT_LINK_DIRECTORIES is preserved - Tests/RunCMake/ParseImplicitIncludeInfo: tests for parse based on the older Tests/CMakeTests/ImplicitLinkInfoTest.cmake.in. The test runs a set of verbose compiler outputs collected from various machines through the parser and checks the results. New compiler files can be added by dropping input/output files in the ParseImplicitIncludeInfo/data subdirectory and then adding the new set of files to the ${targets} list in ParseImplicitIncludeInfo.cmake. There is a helper CMakeLists.txt in ParseImplicitIncludeInfo/data that can help with the generation of test input files. NOTE: the standard cmake pre-commit hook rejects verbose compiler output with trailing spaces... you have to manually edit them out. This shouldn't impact the test. Note that both the parser and the test code can use CMAKE_${LANG}_COMPILER_* variables such as ${CMAKE_CXX_COMPILER_ID} to decide how to parse verbose compiler output. For the test code, this requires us to save the variables values in the test input files. Fixes: #16291
| * | | | | | CMakeDetermineCompilerABI: set locale to C for try_compile()Chuck Cranor2019-01-211-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Have CMakeDetermineCompilerABI set the locale to C before calling try_compile(). This is for the implicit include path parser to keep all the verbose compiler messages in English so we can parse it. See #18784 for discussion.
| * | | | | | CMakeDetermineCompilerABI: pass verbose flag during compilationBrad King2019-01-212-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to the same flag that is used for verbose link information, but provide another internal platform information variable to use a compilation-specific variant. Populate it for CUDA where we use a different compiler for compilation and linking and therefore need different flags. Co-Author: Chuck Cranor <chuck@ece.cmu.edu>
| * | | | | | 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-212-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-229-22/+68
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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