summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | Help: Mark default CMake generator with asteriskArtur Ryt2019-01-186-8/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-222-1/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-212-1/+7
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'findgit-imported-target'Brad King2019-01-226-0/+63
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97700e9f5b FindGit: Add imported target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2790
| * | | | | FindGit: Add imported targetKyle Edwards2019-01-216-0/+63
| |/ / / /
* | | | | 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
| | | | | | |
* | | | | | | Merge topic 'depends-string'Brad King2019-01-2210-73/+76
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c50a72576 cmDepends: all members accept std::string arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2827
| * | | | | | | cmDepends: all members accept std::string argumentsVitaly Stakhovsky2019-01-1910-73/+76
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most `const char*` arguments converted to `const std::string&` in `cmDepends` and derived classes. In addition performed minor code cleanup.
* | | | | | | Merge topic 'cmake-gui-generator-platform'Brad King2019-01-2215-29/+341
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67bced8a26 cmake-gui: Improve label for default platform 48ec0bc140 cmake-gui: Add field for generator platform selection 8bba458ea5 Add global generator factory method to get default platform name 818df52c48 Add global generator factory method to get list of known platforms 8144b00e32 Split global generator factory list with and without platforms b70c0aed5c VS: Factor out helper function to compute host platform name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2832
| * | | | | | | cmake-gui: Improve label for default platformJulien Jomier2019-01-212-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify the default platform to be used when the platform field is empty
| * | | | | | | cmake-gui: Add field for generator platform selectionJulien Jomier2019-01-185-4/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the "first configure" dialog with a field for the user to select a value for `CMAKE_GENERATOR_PLATFORM`. Fixes: #17343
| * | | | | | | Add global generator factory method to get default platform nameBrad King2019-01-1810-0/+26
| | | | | | | |
| * | | | | | | Add global generator factory method to get list of known platformsBrad King2019-01-1810-0/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `cmGlobalGeneratorFactory::GetKnownPlatforms` method to return a list of known possible values for `CMAKE_GENERATOR_PLATFORM`. Implement the method for each generator by referencing the list of possible values documented in `Help/generator/*.rst` for it. Co-Author: Julien Jomier <julien.jomier@kitware.com>
| * | | | | | | Split global generator factory list with and without platformsBrad King2019-01-1810-15/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace `cmGlobalGeneratorFactory::GetGenerators` with a pair of methods to split the list of generator names into those that have platforms in the name and those that do not.
| * | | | | | | VS: Factor out helper function to compute host platform nameBrad King2019-01-181-10/+15
| |/ / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2019-01-221-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'ExternalProject-non-cmake-source-subdir'Brad King2019-01-215-2/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c09ec79981 ExternalProject: support SOURCE_SUBDIR for BUILD_IN_SOURCE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2823
| * | | | | | ExternalProject: support SOURCE_SUBDIR for BUILD_IN_SOURCEBen Boeckel2019-01-175-2/+49
| | | | | | |
* | | | | | | Merge topic 'read-list-file'Brad King2019-01-2115-47/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25caf7bafe cmMakefile::ReadListFile() accepts std::string argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2821
| * | | | | | | cmMakefile::ReadListFile() accepts std::string argumentVitaly Stakhovsky2019-01-1715-47/+42
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Same for cmMakefile::ReadDependentFile(); some cleanup
generated by cgit v0.12 at 2024-11-14 18:21:15 (GMT)