summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | 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.
* | | | | | | | Merge topic 'ExternalProject-list-sep-in-cache'Brad King2019-11-211-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 46de38dae2 ExternalProject: replace LIST_SEPARATOR in initial cache files too Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4070
| * | | | | | | | ExternalProject: replace LIST_SEPARATOR in initial cache files tooBen Boeckel2019-11-201-0/+5
| |/ / / / / / /
* | | | | | | | Merge topic 'load_cache_in_script'Brad King2019-11-2111-2/+79
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5e9ecaae0e load_cache: Allow READ_WITH_PREFIX mode in cmake scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4042
| * | | | | | | | load_cache: Allow READ_WITH_PREFIX mode in cmake scriptsCharles Barto2019-11-1911-2/+79
| | | | | | | | |
* | | | | | | | | Merge topic 'fileapi-multi-config'Brad King2019-11-214-2/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51c69fe5f8 FileAPI: Add "multiConfig" parameter to index file Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !4072
| * | | | | | | | | FileAPI: Add "multiConfig" parameter to index fileKyle Edwards2019-11-204-2/+14
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'release-3.16'Brad King2019-11-210-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'FindwxWidgets-qt-debug' into release-3.16Brad King2019-11-211-0/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | / / / | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | 84408ff402 FindwxWidgets: Find wxQt debug libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4069
* | | | | | | | Merge topic 'FindwxWidgets-qt-debug'Brad King2019-11-211-0/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84408ff402 FindwxWidgets: Find wxQt debug libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4069
| * | | | | | | FindwxWidgets: Find wxQt debug librariesCraig Sturdy2019-11-201-0/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the change from commit fe54989fcd (FindwxWidgets: Add support for wxQt, 2019-11-12, v3.16.0-rc4~12^2~1) to also find debug-enabled libs.
* | | | | | | CMake Nightly Date StampKitware Robot2019-11-211-1/+1
| |/ / / / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2019-11-201-1/+1
| | | | | |
* | | | | | Merge topic 'ctest-repeat'Craig Scott2019-11-1927-99/+82
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32c165d263 CTest: Consolidate '--repeat-* n' options as `--repeat *:n` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4053
| * | | | | CTest: Consolidate '--repeat-* n' options as `--repeat *:n`Brad King2019-11-1527-99/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Combine `--repeat-until-fail`, `--repeat-until-pass`, and `--repeat-after-timeout` to create a single `--repeat <mode>:<n>` option. Retain `--repeat-until-fail` too because that has been available in previous releases.
* | | | | | Merge topic 'ccmake_render_main_form_on_resize'Brad King2019-11-191-12/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce99f5ee69 ccmake: Fix rendering on window resize Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4061
| * | | | | | ccmake: Fix rendering on window resizeSylvain Joubert2019-11-181-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repro steps: configure (without errors), the logs are displayed then the cache is displayed again, resize the window up -> the logs are redisplayed after resize instead of the cache The 'CurrentForm' pointer were left pointed to the last log message form, this resets it to the main form when configure or generate is done
* | | | | | | Merge topic 'xcode-scheme-workdir'Brad King2019-11-1911-6/+67
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 92c4c852db Xcode: Add custom working directory property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4063
| * | | | | | | Xcode: Add custom working directory propertyGregor Jasny2019-11-1811-6/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes: #19967
* | | | | | | | Merge topic 'codelite_make_j_0'Brad King2019-11-191-1/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d6639bf8d CodeLite: Do not pass -j argument with CPU count 0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4067
| * | | | | | | | CodeLite: Do not pass -j argument with CPU count 0Johnny Jazeix2019-11-181-1/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #15054, #16727
* | | | | | | | Merge topic 'modernize-memory-management'Brad King2019-11-191-28/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e86f71eff cmOutputRequiredFilesCommand: Modernize memory management Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4055
| * | | | | | | | cmOutputRequiredFilesCommand: Modernize memory managementMarc Chevrier2019-11-151-28/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also use std::string over char* when possible.
* | | | | | | | | Merge topic 'sdcc-sdar'Brad King2019-11-192-10/+30
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5cf404d36f SDCC compiler: use sdar instead of sdcclib as librarian for recent versions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4065
| * | | | | | | | | SDCC compiler: use sdar instead of sdcclib as librarian for recent versionsJohnny Jazeix2019-11-182-10/+30
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19988
* | | | | | | | | Merge topic 'FindFLEX-work-dir'Brad King2019-11-195-20/+102
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c5fb36a4cb FindFLEX: Add policy CMP0098 to run flex in build tree Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3981
| * | | | | | | | | FindFLEX: Add policy CMP0098 to run flex in build treeJannick2019-11-155-20/+102
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2019-11-191-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'release-3.16'Brad King2019-11-180-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | CMake 3.16.0-rc4v3.16.0-rc4Brad King2019-11-181-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'release-3.16'Brad King2019-11-180-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge topic 'swift-rpath-darwin' into release-3.16Brad King2019-11-181-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff6c336127 Swift: support `-rpath` on Darwin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4059
* | \ \ \ \ \ \ \ \ Merge topic 'swift-rpath-darwin'Brad King2019-11-181-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff6c336127 Swift: support `-rpath` on Darwin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4059
| * | | | | | | | | Swift: support `-rpath` on DarwinSaleem Abdulrasool2019-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Darwin also has the concept of RPATH. Additionally, the flag is identical to that on other Unixish platforms. Simply avoid the `-rpath` handling on Windows. This enables the use of `BUILD_WITH_INSTALL_RPATH` and `INSTALL_RPATH` with Swift targets on Darwin.
* | | | | | | | | | Merge branch 'release-3.16'Brad King2019-11-180-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'swift-darwin-install-name' into release-3.16Brad King2019-11-181-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f935de6746 Swift: support `INSTALL_NAME_DIR` on Darwin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4060
* | \ \ \ \ \ \ \ \ \ Merge topic 'swift-darwin-install-name'Brad King2019-11-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | / / / / / / | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | f935de6746 Swift: support `INSTALL_NAME_DIR` on Darwin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4060
| * | | | | | | | | Swift: support `INSTALL_NAME_DIR` on DarwinSaleem Abdulrasool2019-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust the shared object rule to ensure that we honour the `INSTALL_NAME_DIR` property on Swift targets. This enables the use of `INSTALL_NAME_DIR` and `BUILD_WITH_INSTALL_NAME_DIR` on Darwin with Ninja.
* | | | | | | | | | Merge branch 'release-3.16'Brad King2019-11-180-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |