mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 20:00:51 -05:00
Code Issues Packages Projects Releases Wiki Activity
45,971 Commits 2 Branches 401 Tags
398dfc1338eb2ccd98ae5513fe6ebeb019cf7bcd
Commit Graph

45971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kyle Edwards 398dfc1338 Merge topic 'ctest-spec-file-version-test' 
59df85194e CTest Resource Allocation: Add test for spec file with no version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4092
 2019-11-27 22:48:20 -05:00
Kitware Robot 7046a52198 CMake Nightly Date Stamp 2019-11-27 00:01:12 -05:00
Kyle Edwards 59df85194e CTest Resource Allocation: Add test for spec file with no version 2019-11-26 11:41:56 -05:00
Brad King ffe801062a Merge branch 'release-3.16' 2019-11-26 10:18:59 -05:00
Brad King 1b4482f65d CMake 3.16.0 v3.16.0 2019-11-26 09:18:07 -05:00
Brad King 797e55a5ef Merge topic 'xlf-ninja' 
19f267c75e XL: Add support for Ninja and XL Fortran

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4075
 2019-11-26 09:14:33 -05:00
Brad King ff198efc77 Merge branch 'release-3.16' 2019-11-26 09:12:34 -05:00
Brad King 3d5227e6b6 Merge topic 'ctest-resource-fixes' 
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
 2019-11-26 09:12:34 -05:00
Brad King b1175431c3 Merge topic 'ctest-resource-fixes' into release-3.16 
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
 2019-11-26 09:12:33 -05:00
Kyle Edwards a033bafbe0 Help: Clarify how tests are run if no resource spec file is specified 
Fixes: #19985
 2019-11-26 09:10:22 -05:00
Brad King eafce6c256 Merge branch 'release-3.15' 2019-11-26 09:03:54 -05:00
Brad King 4e4327ee3c Merge branch 'backport-implicit-includes-extra-CR' into release-3.15 
Merge-request: !4088
 2019-11-26 09:03:14 -05:00
Brad King 8741d9e262 Merge branch 'release-3.16' 2019-11-26 09:02:41 -05:00
Brad King 8db38cfe33 Merge topic 'implicit-includes-extra-CR' into release-3.16 
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
 2019-11-26 09:02:40 -05:00
Brad King 78a85fd069 Merge topic 'implicit-includes-extra-CR' 
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
 2019-11-26 09:02:40 -05:00
Brad King 6d84afc7f2 Merge branch 'backport-implicit-includes-extra-CR' into implicit-includes-extra-CR 2019-11-26 09:00:38 -05:00
Brad King 101f7ac63d Merge branch 'release-3.16' 2019-11-26 08:56:33 -05:00
Brad King 5c49f82a2d Merge topic 'FindODBC-mingw' 
cb8042b0ab FindODBC: Add library name for MinGW toolchains

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4076
 2019-11-26 08:56:33 -05:00
Brad King 0cb043390b Merge topic 'FindODBC-mingw' into release-3.16 
cb8042b0ab FindODBC: Add library name for MinGW toolchains

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4076
 2019-11-26 08:56:32 -05:00
Brad King 86356f140f Merge branch 'release-3.16' 2019-11-26 08:55:09 -05:00
Brad King 557ceacf82 Merge topic 'unity-no-duplicate-path' into release-3.16 
43ffd2c35c Unity: No repeated path for internal generated unity files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4077
 2019-11-26 08:55:09 -05:00
Brad King 7525f0ec6c Merge topic 'unity-no-duplicate-path' 
43ffd2c35c Unity: No repeated path for internal generated unity files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4077
 2019-11-26 08:55:09 -05:00
Kitware Robot bb3d82232d CMake Nightly Date Stamp 2019-11-26 00:01:10 -05:00
Brad King 4b46523d90 CMakeParseImplicitIncludeInfo: Remove all CR chars from compiler output 
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
 2019-11-25 14:32:02 -05:00
Cristian Adam cb8042b0ab FindODBC: Add library name for MinGW toolchains 
Fixes: #20018
 2019-11-25 13:55:51 -05:00
Kyle Edwards a64ba0235f CTest: Clarify that resource requirements can be split 
Add a note to the documentation to clarify this, and add test cases
to ensure it.

Fixes: #19987
 2019-11-25 11:08:27 -05:00
Kyle Edwards f9f294f5fa CTest: Add version field to resource spec file 
Fixes: #20007
 2019-11-25 11:08:27 -05:00
Brad King e17934c183 Merge topic 'git-var' 
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
 2019-11-25 10:53:13 -05:00
Brad King 58da842063 Merge branch 'release-3.16' 2019-11-25 09:38:08 -05:00
Brad King 99f0881d8c Merge topic 'FindwxWidgets-rel-and-dbg' into release-3.16 
a5bb08a8c0 FindwxWidgets: Fix finding both release and debug libs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4079
 2019-11-25 09:38:07 -05:00
Brad King db3d3ab4fb Merge topic 'FindwxWidgets-rel-and-dbg' 
a5bb08a8c0 FindwxWidgets: Fix finding both release and debug libs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4079
 2019-11-25 09:38:07 -05:00
Cristian Adam 43ffd2c35c Unity: No repeated path for internal generated unity files 
Fixes: #20002
 2019-11-25 13:33:44 +01:00
Kitware Robot ae2c2f1f1b CMake Nightly Date Stamp 2019-11-25 00:01:06 -05:00
Arkadiusz Drabczyk 5129e97285 setup-user: switch to git-var to check if username and e-mail are set 
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.
 2019-11-24 19:10:56 +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
Brad King a5bb08a8c0 FindwxWidgets: Fix finding both release and debug libs 
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
 2019-11-22 11:03:33 -05:00
Kitware Robot 07226324eb CMake Nightly Date Stamp 2019-11-22 00:01:10 -05:00
Brad King 19f267c75e XL: Add support for Ninja and XL Fortran 
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
 2019-11-21 15:59:12 -05:00
Brad King 52accc779e Merge branch 'release-3.16' 2019-11-21 11:27:26 -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 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 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