mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-21 21:58:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
45,938 Commits 2 Branches 401 Tags
3dc084ebc1fb261aea69dbd254d50ffd1604dc80
Commit Graph

45938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Eiband 3dc084ebc1 cmMakefile: Explicitly pass backtrace to GetCustomCommandTarget 
Allow GetCustomCommandTarget to be called at generate time with correct
backtraces.
 2019-11-24 20:13:23 +01:00
Daniel Eiband e8360afbf7 cmPluginAPI: Correct typo in documentation of FinalPass 2019-11-24 20:13:23 +01:00
Daniel Eiband bf76a6b801 cmMakefile: Delay CheckTargetProperties and FinalPass to generate time 2019-11-24 20:13:23 +01:00
Kitware Robot adc50529ac CMake Nightly Date Stamp 2019-11-24 00:01:07 -05:00
Kitware Robot d8571ccb9c CMake Nightly Date Stamp 2019-11-23 00:01:10 -05:00
Kitware Robot 07226324eb CMake Nightly Date Stamp 2019-11-22 00:01:10 -05:00
Brad King 52accc779e Merge branch 'release-3.16' 2019-11-21 11:27:26 -05:00
Brad King 51d83d4955 Merge topic 'xcode-objc' 
1e68fb0c91 Xcode: Set source file type for Objective C/C++

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4073
 2019-11-21 11:27:25 -05:00
Brad King 602f2118b0 Merge topic 'xcode-objc' into release-3.16 
1e68fb0c91 Xcode: Set source file type for Objective C/C++

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4073
 2019-11-21 11:27:25 -05:00
Brad King ad815939c9 Merge topic 'ccmake_fix_help_text_crash' 
b4ef7fbaa8 ccmake: Fix crash with cache entries almost the size of the window

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4062
 2019-11-21 11:10:34 -05:00
Brad King 0b14c3fded Merge topic 'FindMPI-improve-error' 
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
 2019-11-21 11:05:52 -05:00
Brad King 96820562c6 Merge topic 'UseJava-javadoc-classpath-separator' 
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
 2019-11-21 11:05:03 -05:00
Brad King d2f859f151 Merge topic 'ExternalProject-list-sep-in-cache' 
46de38dae2 ExternalProject: replace LIST_SEPARATOR in initial cache files too

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4070
 2019-11-21 11:04:03 -05:00
Brad King ae7d99fbd5 Merge topic 'load_cache_in_script' 
5e9ecaae0e load_cache: Allow READ_WITH_PREFIX mode in cmake scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4042
 2019-11-21 11:03:09 -05:00
Brad King d9cf0ec4d4 Merge topic 'fileapi-multi-config' 
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
 2019-11-21 11:02:00 -05:00
Brad King 95387dbf60 Merge branch 'release-3.16' 2019-11-21 11:00:34 -05:00
Brad King 2a2c890023 Merge topic 'FindwxWidgets-qt-debug' into release-3.16 
84408ff402 FindwxWidgets: Find wxQt debug libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4069
 2019-11-21 11:00:33 -05:00
Brad King 905b7759ad Merge topic 'FindwxWidgets-qt-debug' 
84408ff402 FindwxWidgets: Find wxQt debug libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4069
 2019-11-21 11:00:33 -05:00
Kitware Robot 0fff8d653c CMake Nightly Date Stamp 2019-11-21 00:01:07 -05:00
Nathan Burles 8d47b97a69 UseJava: Use correct path separator in javadoc 
For both classpath and sourcepath.
 2019-11-20 10:38:44 -05:00
Nathan Burles 1b27ac78ac UseJava: Use list(APPEND) to simplify javadoc option construction 2019-11-20 10:38:44 -05:00
Nathan Burles c7a4b1a58e UseJava: Extract the path separator to module level 
It is currently only defined within the add_jar function, but is needed
inside other functions in this module.
 2019-11-20 10:38:44 -05:00
Keith Ballard e221039e11 FindMPI: Improve error when a component's language is not enabled 
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
 2019-11-20 10:23:33 -05:00
Craig Sturdy 84408ff402 FindwxWidgets: Find wxQt debug libraries 
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.
 2019-11-20 10:06:15 -05:00
Kyle Edwards 51c69fe5f8 FileAPI: Add "multiConfig" parameter to index file 2019-11-20 09:46:10 -05:00
Brad King 1e68fb0c91 Xcode: Set source file type for Objective C/C++ 
Fixes: #19998
 2019-11-20 09:43:00 -05:00
Ben Boeckel 46de38dae2 ExternalProject: replace LIST_SEPARATOR in initial cache files too 2019-11-20 09:21:46 -05:00
Kitware Robot 5f630a934a CMake Nightly Date Stamp 2019-11-20 00:01:10 -05:00
Craig Scott 9e9787f19a Merge topic 'ctest-repeat' 
32c165d263 CTest: Consolidate '--repeat-* n' options as `--repeat *:n`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4053
 2019-11-19 15:48:38 -05:00
Charles Barto 5e9ecaae0e load_cache: Allow READ_WITH_PREFIX mode in cmake scripts 2019-11-19 14:39:00 -05:00
Sylvain Joubert b4ef7fbaa8 ccmake: Fix crash with cache entries almost the size of the window 
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*
 2019-11-19 20:06:31 +01:00
Brad King 3520208cbd Merge topic 'ccmake_render_main_form_on_resize' 
ce99f5ee69 ccmake: Fix rendering on window resize

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4061
 2019-11-19 11:37:27 -05:00
Brad King a1d0653fc8 Merge topic 'xcode-scheme-workdir' 
92c4c852db Xcode: Add custom working directory property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4063
 2019-11-19 11:31:16 -05:00
Brad King aa6437e3e0 Merge topic 'codelite_make_j_0' 
7d6639bf8d CodeLite: Do not pass -j argument with CPU count 0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4067
 2019-11-19 11:30:20 -05:00
Brad King ba773cfec8 Merge topic 'modernize-memory-management' 
7e86f71eff cmOutputRequiredFilesCommand: Modernize memory management

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4055
 2019-11-19 11:29:26 -05:00
Brad King 5aa94a1d0d Merge topic 'sdcc-sdar' 
5cf404d36f SDCC compiler: use sdar instead of sdcclib as librarian for recent versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4065
 2019-11-19 11:28:13 -05:00
Brad King fb7f8e5fbd Merge topic 'FindFLEX-work-dir' 
c5fb36a4cb FindFLEX: Add policy CMP0098 to run flex in build tree

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3981
 2019-11-19 11:27:15 -05:00
Kitware Robot 843936f51b CMake Nightly Date Stamp 2019-11-19 00:01:12 -05:00
Brad King 6eaa355e90 Merge branch 'release-3.16' 2019-11-18 17:02:37 -05:00
Gregor Jasny 92c4c852db Xcode: Add custom working directory property 
Closes: #19967
 2019-11-18 22:34:34 +01:00
Johnny Jazeix 7d6639bf8d CodeLite: Do not pass -j argument with CPU count 0 
Fixes: #15054, #16727
 2019-11-18 22:10:57 +01:00
Johnny Jazeix 5cf404d36f SDCC compiler: use sdar instead of sdcclib as librarian for recent versions 
Fixes: #19988
 2019-11-18 20:12:49 +01:00
Brad King d25d75687d CMake 3.16.0-rc4 v3.16.0-rc4 2019-11-18 13:44:31 -05:00
Brad King 9112933a6c Merge branch 'release-3.16' 2019-11-18 13:43:12 -05:00
Brad King 3a87ce6c96 Merge topic 'swift-rpath-darwin' into release-3.16 
ff6c336127 Swift: support `-rpath` on Darwin

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4059
 2019-11-18 13:43:11 -05:00
Brad King 9c9bbedd31 Merge topic 'swift-rpath-darwin' 
ff6c336127 Swift: support `-rpath` on Darwin

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4059
 2019-11-18 13:43:11 -05:00
Brad King 3bc808fc33 Merge branch 'release-3.16' 2019-11-18 13:42:09 -05:00
Brad King eead6a2504 Merge topic 'swift-darwin-install-name' 
f935de6746 Swift: support `INSTALL_NAME_DIR` on Darwin

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4060
 2019-11-18 13:42:09 -05:00
Brad King 4bbd9e9ec4 Merge topic 'swift-darwin-install-name' into release-3.16 
f935de6746 Swift: support `INSTALL_NAME_DIR` on Darwin

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4060
 2019-11-18 13:42:08 -05:00
Sylvain Joubert ce99f5ee69 ccmake: Fix rendering on window resize 
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
 2019-11-18 17:05:37 +01:00