summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* launcher: support setting a compiler launcher through the environmentBen Boeckel2019-12-0533-12/+88
| | | | | | This makes it much easier to use a launcher for all CMake projects in an environment rather than having to remember to pass the setting to every CMake build.
* CMake Nightly Date StampKitware Robot2019-11-271-1/+1
|
* Merge branch 'release-3.16'Brad King2019-11-260-0/+0
|\
| * CMake 3.16.0v3.16.0Brad King2019-11-261-1/+1
| |
* | Merge topic 'xlf-ninja'Brad King2019-11-266-0/+54
|\ \ | | | | | | | | | | | | | | | | | | 19f267c75e XL: Add support for Ninja and XL Fortran Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4075
| * | XL: Add support for Ninja and XL FortranBrad King2019-11-216-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Ninja generator's support for Fortran requires that source files be preprocessed explicitly first. However, the `xlf` compiler does not have a simple `-E` option or equivalent to do preprocessing. The only documented way to get preprocessed output is to use `-d` to leave it behind, but only at an inflexible location. Instead, create our own `cpp` wrapper script and substitute it for the real preprocessor using `-tF -B ...`. Teach the wrapper to map the `cpp` output to the location we need and then invoke the real `cpp` underneath. Fixes: #19450
* | | Merge branch 'release-3.16'Brad King2019-11-260-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'ctest-resource-fixes' into release-3.16Brad King2019-11-2647-2/+282
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a033bafbe0 Help: Clarify how tests are run if no resource spec file is specified a64ba0235f CTest: Clarify that resource requirements can be split f9f294f5fa CTest: Add version field to resource spec file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4080
* | \ \ Merge topic 'ctest-resource-fixes'Brad King2019-11-2647-2/+282
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | a033bafbe0 Help: Clarify how tests are run if no resource spec file is specified a64ba0235f CTest: Clarify that resource requirements can be split f9f294f5fa CTest: Add version field to resource spec file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4080
| * | | Help: Clarify how tests are run if no resource spec file is specifiedKyle Edwards2019-11-261-0/+17
| | | | | | | | | | | | | | | | Fixes: #19985
| * | | CTest: Clarify that resource requirements can be splitKyle Edwards2019-11-2510-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note to the documentation to clarify this, and add test cases to ensure it. Fixes: #19987
| * | | CTest: Add version field to resource spec fileKyle Edwards2019-11-2537-0/+224
| | | | | | | | | | | | | | | | Fixes: #20007
* | | | Merge branch 'release-3.15'Brad King2019-11-260-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'backport-implicit-includes-extra-CR' into release-3.15Brad King2019-11-261-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !4088
* | \ \ \ \ Merge branch 'release-3.16'Brad King2019-11-260-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge topic 'implicit-includes-extra-CR' into release-3.16Brad King2019-11-261-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d84afc7f2 Merge branch 'backport-implicit-includes-extra-CR' into implicit-includes-extra-CR 4b46523d90 CMakeParseImplicitIncludeInfo: Remove all CR chars from compiler output 2a5e5b25ba CMake 3.15.5 08173075c1 Merge branch 'doc-genex-tweak' into release-3.15 83dbef1135 Merge branch 'InstallRequiredSystemLibraries-redist' into release-3.15 881bca249d Merge branch 'vs-v142-csharp-flags' into release-3.15 dec3e9363e Merge branch 'backport-vs-16.4-global-targets' into release-3.15 ac1a1bf18b VS: Tell VS 16.4 not to verify CMake-provided custom command outputs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4088
* | \ \ \ \ \ Merge topic 'implicit-includes-extra-CR'Brad King2019-11-261-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d84afc7f2 Merge branch 'backport-implicit-includes-extra-CR' into implicit-includes-extra-CR 4b46523d90 CMakeParseImplicitIncludeInfo: Remove all CR chars from compiler output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4088
| * | | | | | Merge branch 'backport-implicit-includes-extra-CR' into ↵Brad King2019-11-261-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | implicit-includes-extra-CR
| | * | | | | CMakeParseImplicitIncludeInfo: Remove all CR chars from compiler outputBrad King2019-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With Clang/LLVM on MinGW, lines ending in `\r\r\n` have been observed. Filter out all `\r` characters from these line endings. Fixes: #20021
* | | | | | | Merge branch 'release-3.16'Brad King2019-11-260-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge topic 'FindODBC-mingw' into release-3.16Brad King2019-11-261-0/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb8042b0ab FindODBC: Add library name for MinGW toolchains Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4076
* | \ \ \ \ \ \ Merge topic 'FindODBC-mingw'Brad King2019-11-261-0/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb8042b0ab FindODBC: Add library name for MinGW toolchains Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4076
| * | | | | | | FindODBC: Add library name for MinGW toolchainsCristian Adam2019-11-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20018
* | | | | | | | Merge branch 'release-3.16'Brad King2019-11-260-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'unity-no-duplicate-path' into release-3.16Brad King2019-11-261-13/+16
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 43ffd2c35c Unity: No repeated path for internal generated unity files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4077
* | | | | | | | Merge topic 'unity-no-duplicate-path'Brad King2019-11-261-13/+16
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 43ffd2c35c Unity: No repeated path for internal generated unity files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4077
| * | | | | | | Unity: No repeated path for internal generated unity filesCristian Adam2019-11-251-13/+16
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Fixes: #20002
* | | | | | | CMake Nightly Date StampKitware Robot2019-11-261-1/+1
| | | | | | |
* | | | | | | Merge topic 'git-var'Brad King2019-11-251-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5129e97285 setup-user: switch to git-var to check if username and e-mail are set Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4084
| * | | | | | | setup-user: switch to git-var to check if username and e-mail are setArkadiusz Drabczyk2019-11-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In git, apart from setting username and e-mail in .gitconfig it's also possible to set username in /etc/passwd and set e-mail using EMAIL environment variable. The advantage of this method is that other programs such as mutt or doxygen will pick up these settings up so there is no need to set them separately in each program. Current way of checking if username and e-mail are set using git config results in failure if they are set using this method.
* | | | | | | | Merge branch 'release-3.16'Brad King2019-11-250-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge topic 'FindwxWidgets-rel-and-dbg' into release-3.16Brad King2019-11-251-1/+1
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5bb08a8c0 FindwxWidgets: Fix finding both release and debug libs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4079
* | | | | | | | Merge topic 'FindwxWidgets-rel-and-dbg'Brad King2019-11-251-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5bb08a8c0 FindwxWidgets: Fix finding both release and debug libs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4079
| * | | | | | | FindwxWidgets: Fix finding both release and debug libsBrad King2019-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit fe54989fcd (FindwxWidgets: Add support for wxQt, 2019-11-12, v3.16.0-rc4~12^2~1) the internal `WX_FIND_LIBS` macro gained an argument but not all call sites were updated. Update the missing one now. Fixes: #20005
* | | | | | | | CMake Nightly Date StampKitware Robot2019-11-251-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2019-11-241-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2019-11-231-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2019-11-221-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'release-3.16'Brad King2019-11-210-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'xcode-objc' into release-3.16Brad King2019-11-211-0/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e68fb0c91 Xcode: Set source file type for Objective C/C++ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4073
* | \ \ \ \ \ Merge topic 'xcode-objc'Brad King2019-11-211-0/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e68fb0c91 Xcode: Set source file type for Objective C/C++ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4073
| * | | | | | Xcode: Set source file type for Objective C/C++Brad King2019-11-201-0/+4
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Fixes: #19998
* | | | | | Merge topic 'ccmake_fix_help_text_crash'Brad King2019-11-212-86/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b4ef7fbaa8 ccmake: Fix crash with cache entries almost the size of the window Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4062
| * | | | | | ccmake: Fix crash with cache entries almost the size of the windowSylvain Joubert2019-11-192-86/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code: if (curFieldLen < width) { ... strncpy(bar + curFieldLen + 2, help, width - curFieldLen - 2); was not correctly guarded against cache entries whose size were exactly 1 or 2 characters short of the window size. "if (curFieldLen - 2 < width)" would have prevented a copy of negative/max_int characters and a subsequent crash. The whole method was modernized with std::string instead of char*
* | | | | | | Merge topic 'FindMPI-improve-error'Brad King2019-11-211-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e221039e11 FindMPI: Improve error when a component's language is not enabled Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4071
| * | | | | | | FindMPI: Improve error when a component's language is not enabledKeith Ballard2019-11-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if a CMake project requests a component for a language that is not enabled, it would simply give an error with the message Could NOT find MPI (missing: MPI_${LANG}_FOUND) which is not indicative that the language was not enabled. This change provides an error message indicating that it failed to find the particular MPI component because no compiler was available for the language and the language might need to be enabled for the project. Closes: #19996
* | | | | | | | Merge topic 'UseJava-javadoc-classpath-separator'Brad King2019-11-211-43/+23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d47b97a69 UseJava: Use correct path separator in javadoc 1b27ac78ac UseJava: Use list(APPEND) to simplify javadoc option construction c7a4b1a58e UseJava: Extract the path separator to module level Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3967
| * | | | | | | | UseJava: Use correct path separator in javadocNathan Burles2019-11-201-20/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For both classpath and sourcepath.
| * | | | | | | | UseJava: Use list(APPEND) to simplify javadoc option constructionNathan Burles2019-11-201-10/+11
| | | | | | | | |
| * | | | | | | | UseJava: Extract the path separator to module levelNathan Burles2019-11-201-15/+10
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is currently only defined within the add_jar function, but is needed inside other functions in this module.