mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 13:20:47 -06:00
Code Issues Packages Projects Releases Wiki Activity
36,211 Commits 2 Branches 385 Tags
594a9fcf6fa1ad9bcfe91abe7d94df2e92f3d11b
Commit Graph

22895 Commits

Author SHA1 Message Date
Brad King
594a9fcf6f Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-06-01 (8243fefa)
 2017-06-01 14:07:35 -04:00
Brad King
6a42b9609f Merge topic 'ninja-mingw' 
82badfff Ninja: Fix CMP0058 on MinGW
c5ff50fc Tests: Fix CustomCommandByproducts regex for phony rules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !919
 2017-06-01 14:00:58 -04:00
Brad King
75850db667 Merge topic 'update-kwsys' 
5e9bd8a2 Merge branch 'upstream-KWSys' into update-kwsys
50988f6d KWSys 2017-05-31 (bd0bbad7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !915
 2017-06-01 13:34:11 -04:00
Kitware Robot
09e10f0937 CMake Nightly Date Stamp 2017-06-01 00:01:06 -04:00
Brad King
82badfffc3 Ninja: Fix CMP0058 on MinGW 
For CMP0058 we identify dependencies that have no rules to generate them
by collecting a set of all dependencies and a set of all files CMake
knows are generated by something, and then computing a set difference.
Fix construction of these sets to use the same form for each path.
This is after ConvertToNinjaPath but before EncodePath.

Without this, the slash conversion done by EncodePath for the GNU
compiler on Windows results in a mismatch, triggering an incorrect
CMP0058 warning.
 2017-05-31 13:44:16 -04:00
Brad King
5e9bd8a2ea Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-05-31 (bd0bbad7)
 2017-05-31 09:11:14 -04:00
Brad King
de16ff3e58 Merge topic 'ninja-mingw' 
6a2f8335 Ninja: Fix escaping of path to depfile
781eb380 Tests: Fix VSResource test on MinGW with Ninja and a space in the path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !911
 2017-05-31 08:55:44 -04:00
Brad King
47281310bf Merge topic 'minor-cleanups' 
ed77c5c5 cmQtAutoGeneratorInitializer: Remove unused local variable
b398e716 cmVisualStudio10TargetGenerator: Remove shadowing local variable
da2330bd cmVisualStudio10ToolsetOptions: Remove unused include

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !910
 2017-05-31 08:54:51 -04:00
Kitware Robot
b3379e63e0 CMake Nightly Date Stamp 2017-05-31 00:01:08 -04:00
Brad King
6a2f833563 Ninja: Fix escaping of path to depfile 
Replace the dedicated and non-portable escaping code with use of our
standard escaping logic.
 2017-05-30 15:30:43 -04:00
Brad King
ed77c5c5bd cmQtAutoGeneratorInitializer: Remove unused local variable 2017-05-30 13:27:36 -04:00
Brad King
b398e716f9 cmVisualStudio10TargetGenerator: Remove shadowing local variable 2017-05-30 13:27:31 -04:00
Brad King
da2330bd32 cmVisualStudio10ToolsetOptions: Remove unused include 2017-05-30 13:24:04 -04:00
Kitware Robot
3ed14cb3ac CMake Nightly Date Stamp 2017-05-30 00:01:04 -04:00
Kitware Robot
e75ac5aa03 CMake Nightly Date Stamp 2017-05-29 00:01:05 -04:00
Brad King
f8642f953d Merge topic 'reduce-string-copying' 
2c2bb5f5 Remove unnecessary operator<< usage
1e4e2f99 Remove unused variables
25486156 Improved checking for number of arguments passed
86dc86dd Add const-reference qualifications
76bdb407 Change std::basic_string<char> to std::string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !886
 2017-05-28 09:13:12 -04:00
Brad King
5a0fa11fec Merge topic 'autogen_config' 
e3e692ca Autogen: Test adaptions
dbda5906 Autogen: Per-config file suffixes. New AUTOGEN_BUILD_DIR target property.
0965002e Autogen: Pass build directory in Info file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !858
 2017-05-28 09:11:33 -04:00
Kitware Robot
e6c7c420b1 CMake Nightly Date Stamp 2017-05-28 00:01:03 -04:00
Kitware Robot
6357a22355 CMake Nightly Date Stamp 2017-05-27 00:01:05 -04:00
Pavel Solodovnikov
2c2bb5f527 Remove unnecessary operator<< usage 2017-05-26 19:54:29 +03:00
Pavel Solodovnikov
1e4e2f993c Remove unused variables 2017-05-26 19:52:31 +03:00
Pavel Solodovnikov
2548615630 Improved checking for number of arguments passed 2017-05-26 19:51:40 +03:00
Pavel Solodovnikov
86dc86dd6c Add const-reference qualifications 2017-05-26 19:50:11 +03:00
Brad King
bc407ba6ba Merge topic 'codecvt-revise' 
690acadc codecvt: Re-implement do_out and do_unshift

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !891
 2017-05-26 11:17:17 -04:00
Brad King
5b8ac116c3 Merge topic 'cpacklog-string-cref' 
542d9d5e cmCPackLog: pass std::string by const&

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !892
 2017-05-26 11:15:13 -04:00
Brad King
fa0a3210ee Merge topic 'vs-vcxproj-indent' 
30675ec4 VS: Fix indentation of .vcxproj files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !884
 2017-05-26 11:14:33 -04:00
Brad King
256481499d Merge topic 'update-kwsys' 
867b1742 Merge branch 'upstream-KWSys' into update-kwsys
402c6c12 KWSys 2017-05-25 (160bed45)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !890
 2017-05-26 11:13:45 -04:00
Sebastian Holtermann
dbda590628 Autogen: Per-config file suffixes. New AUTOGEN_BUILD_DIR target property. 
Closes #14760
Closes #14313
 2017-05-26 15:27:17 +02:00
Sebastian Holtermann
0965002e57 Autogen: Pass build directory in Info file 2017-05-26 15:23:21 +02:00
Kitware Robot
83e4a8e637 CMake Nightly Date Stamp 2017-05-26 00:01:06 -04:00
Daniel Pfeifer
542d9d5e25 cmCPackLog: pass std::string by const& 2017-05-25 23:40:50 +02:00
Brad King
1aa9eb33e0 Merge topic 'server-fix-warning' 
aa7e9a96 cmServer: Fix compiler -Wdouble-promotion warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !885
 2017-05-25 15:14:22 -04:00
Brad King
a9b11235a8 Merge topic 'find_package-shorter-message' 
d0b9d1cc find_package: shorten output for missing package in config mode
d9df805f cmFindPackageCommand: Split condition to improve readability

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !851
 2017-05-25 15:13:03 -04:00
Brad King
690acadc17 codecvt: Re-implement do_out and do_unshift 
The previous implementation assumed that only one byte would be given
in the `from` buffer by the caller at a time.  This may be true for
MSVC but is not for the GNU library on Windows.  Re-implement these
methods to handle more than one byte per call.

Also simplify the state management by keeping all state between calls
directly in the `mbstate_t` argument instead of using it to index our
own heap-allocated state.

Fixes: #16893
 2017-05-25 15:03:03 -04:00
Brad King
867b17428a Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-05-25 (160bed45)
 2017-05-25 09:40:59 -04:00
Kitware Robot
bc2cfd7c98 CMake Nightly Date Stamp 2017-05-25 00:01:07 -04:00
Pavel Solodovnikov
76bdb40762 Change std::basic_string<char> to std::string 2017-05-24 23:30:57 +03:00
Brad King
30675ec49b VS: Fix indentation of .vcxproj files 
Patch-by: vvs31415 on gitlab.kitware.com
 2017-05-24 11:07:53 -04:00
Brad King
aa7e9a9674 cmServer: Fix compiler -Wdouble-promotion warning 2017-05-24 10:55:45 -04:00
Brad King
5e0858cc15 Merge topic 'update-kwsys' 
6f334159 Merge branch 'upstream-KWSys' into update-kwsys
47a8ff34 KWSys 2017-05-23 (411e958f)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !882
 2017-05-24 10:26:09 -04:00
Kitware Robot
56f87f179a CMake Nightly Date Stamp 2017-05-24 00:01:05 -04:00
Christoph Grüninger
d0b9d1cceb find_package: shorten output for missing package in config mode 
If CONFIG or MODULE is given and the package is not REQUIRED,
output a one-liner instead of the full warning.

Update Tests/RunCMake/find_package expected output to match.
 2017-05-23 15:27:42 -04:00
Christoph Grüninger
d9df805f6a cmFindPackageCommand: Split condition to improve readability 2017-05-23 15:23:10 -04:00
Brad King
6f3341591d Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-05-23 (411e958f)
 2017-05-23 14:34:26 -04:00
Brad King
ae5f98a5e3 Merge topic 'vs-reduce-UseOfMfc' 
b520b18c VS: Write UseOfMfc tag only if CMAKE_MFC_FLAG is present

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !873
 2017-05-23 14:17:16 -04:00
Kitware Robot
c3c77d662a CMake Nightly Date Stamp 2017-05-23 00:01:06 -04:00
Brad King
b520b18c73 VS: Write UseOfMfc tag only if CMAKE_MFC_FLAG is present 
Don't bother writing `UseOfMfc` to `.vcxproj` files when the value is
just the default of `0`.  This keeps the files cleaner.

Patch-by: vvs31415 on gitlab.kitware.com
 2017-05-22 13:17:47 -04:00
Brad King
8ca236592b Merge topic 'add-findpackage-root-prefix' 
fe8f08d2 find_*: Add docs for PackageRoot search path group
57744ca9 find_*: Add tests for PackageRoot search path group
ef3d360a find_*: Add a new PackageRoot search path group

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !796
 2017-05-22 10:40:04 -04:00
Brad King
a748916f5e Merge topic 'cxx-features-check-always' 
f74f01fe Check C++ features even without CMAKE_CXX_STANDARD for CMake itself

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !870
 2017-05-22 10:35:30 -04:00
Kitware Robot
1b7c18a2f3 CMake Nightly Date Stamp 2017-05-22 00:01:04 -04:00