reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-02-25 06:22:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
39,879 Commits 4 Branches 185 Tags
Commit Graph

39879 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Curl Upstream
d431136e02 curl 2018-05-15 (cb013830) 
Code extracted from:

    https://github.com/curl/curl.git

at commit cb013830383f1ccc9757aba36bc32df5ec281c02 (curl-7_60_0).
 2018-05-18 10:16:12 -04:00
Brad King
f3c73b878c curl: Update script to get curl 7.60.0 2018-05-18 10:15:46 -04:00
Melanie Cappelaere
fd0da95f63 Eclipse: Add property to include additional contents in .cproject file 
Similar to ECLIPSE_EXTRA_NATURES which can be used to add a third party
nature to the .project, this property offers the possibility to inject
third party contents into the .cproject.

An example of where this is useful is MCUXpresso. This is an IDE based
on Eclipse. Compiling through CMake generated Eclipse projects works
fine by using a custom toolchain. However, in order to be able to debug
using such a project, an extra storageModule specific to the target
board is needed in the cproject.
 2018-05-18 10:12:19 -04:00
Ruslan Baratov
a203fcc63d cmake: Teach '-E tar' to report errors copying data 
The `copy_data` function checks for errors but the caller ignored
them.  Simplify its return type and add a check to the caller.
 2018-05-18 10:04:18 -04:00
Brad King
b730097788 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2018-05-18 (5357cfc4)
 2018-05-18 09:52:13 -04:00
KWSys Upstream
1f52cb087a KWSys 2018-05-18 (5357cfc4) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 5357cfc4af0cbef4c78df5834ff0440cee3148d1 (master).

Upstream Shortlog
-----------------

Peter Wu (1):
      898dc6b9 SystemTools: Fix GetLineFromStream to avoid libc++ bug on OS X 10.7
 2018-05-18 09:52:12 -04:00
Brad King
8cfc45f6bd clang-format: Explicitly require version 3.8 of the tool 
Versions of clang-format newer than 3.8 produce different output.
Our source code guide says that version 3.8 exactly must be used.
Update the comment in our `.clang-format` config file accordingly.
Add a check to our formatting script to verify the version.
Also update its tool search to look for the explicitly-named
3.8 variant first.
 2018-05-18 09:19:10 -04:00
Kitware Robot
4eea43fce7 CMake Nightly Date Stamp 2018-05-18 00:01:05 -04:00
Brad King
be1f9c9602 Merge branch 'release-3.11' 2018-05-17 10:58:07 -04:00
Brad King
519427e32c CMake 3.11.2 v3.11.2 2018-05-17 09:07:43 -04:00
Brad King
b6ce5aef0f Merge topic 'makefile-ar-limits' 
b6c49713b3 Makefile: Fix command line limits for static libs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2078
 2018-05-17 09:06:56 -04:00
Brad King
4ba7db4ff3 Merge topic 'pr.file_write_check' 
2db4945150 file(WRITE): Report errors during write operation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2076
 2018-05-17 09:06:22 -04:00
Brad King
6411180969 Merge topic 'autogen_register_info_files' 
3715d0fbcf Tests: Add QtAutogen test for a low cmake_minimum_required version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2077
 2018-05-17 09:05:48 -04:00
Brad King
10a6c5a842 Merge topic 'update-kwsys' 
3333e2791b Help: Add release note about 'copy_directory' behavior change
24367563d7 Merge branch 'upstream-KWSys' into update-kwsys
1e0a2e9377 KWSys 2018-05-15 (5f757898)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2080
 2018-05-17 09:05:09 -04:00
Kitware Robot
e81e024330 CMake Nightly Date Stamp 2018-05-17 00:01:06 -04:00
Vitaly Stakhovsky
790fc415b1 cmVisualStudio10TargetGenerator: remove BuildFileStream member 
Stream object is now local to `Generate()`
 2018-05-16 12:59:00 -04:00
Viktor Mukha
b6c49713b3 Makefile: Fix command line limits for static libs 
I have been hitting the Windows command-line limit when cross-compiling
static library (POCO) and having more than 8000 characters in the call
to "ar". Calculating exact limits here are tricky, since this particular
limit will only take into account object file strings, which is correct
for response files, but not for the archive rules (link.txt files),
since they also contain the call to "ar" and its arguments.
Also, there can be other additional arguments if "ar" tool is wrapped
into something else, so it is a good idea to leave more space than
trying to exactly fit the limit.
Since response files use half of the limit as a heuristic, we reproduce
it here for consistency.
 2018-05-16 12:48:20 -04:00
Brad King
acb9710162 Merge topic 'regenerate-lexer-parser' 
7a33cfc1bc regenerate-parsers.bash: Add script to automate parser generation
3d382a494f regenerate-lexers.bash: Add option to check timestamps
5cd9f5c965 regenerate-lexers.bash: Factor file names into variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2081
 2018-05-16 11:53:54 -04:00
Daniel Franke
7a33cfc1bc regenerate-parsers.bash: Add script to automate parser generation 
This depends on

- a suitable flex version in PATH (currently 3.0.4)
- a suitable version of 'sed' in PATH (e.g. GNU sed)
 2018-05-16 11:47:44 -04:00
Daniel Franke
3d382a494f regenerate-lexers.bash: Add option to check timestamps 2018-05-16 11:47:41 -04:00
Daniel Franke
5cd9f5c965 regenerate-lexers.bash: Factor file names into variables 2018-05-16 11:47:37 -04:00
Ruslan Baratov
2db4945150 file(WRITE): Report errors during write operation 
We already report an error if the file cannot be opened for writing.
Add another check to report an error if a write operation itself fails.
 2018-05-16 10:34:28 -04:00
Brad King
9d143ce38c Merge topic 'findqt4-extra-dirs' 
c2934b025d FindQt4: New IMPORTS, PLUGINS and MKSPECS handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2060
 2018-05-16 10:04:38 -04:00
Brad King
cd5d6dfada Merge topic 'subdirectory-linking' 
c9349cc1b9 target_link_libraries: Allow use with targets in other directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2040
 2018-05-16 10:03:39 -04:00
Brad King
c8c07c24dd Merge topic 'dotnet_target_fw_init' 
71a033616a added CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2032
 2018-05-16 10:02:48 -04:00
Brad King
d32ceffb1e Merge topic 'vs-nitpicks' 
b88e138369 cmVisualStudio10TargetGenerator: minor code cleanup

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2063
 2018-05-16 10:01:57 -04:00
Brad King
3333e2791b Help: Add release note about 'copy_directory' behavior change 
Issue: #16001
 2018-05-16 09:54:27 -04:00
Brad King
24367563d7 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2018-05-15 (5f757898)

Fixes: #16001
 2018-05-16 09:54:08 -04:00
KWSys Upstream
1e0a2e9377 KWSys 2018-05-15 (5f757898) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 5f757898119974aa30f700d5c38928ee48407320 (master).

Upstream Shortlog
-----------------

Marian Klymov (1):
      d06fcab7 SystemTools: Check source directory in CopyADirectory
 2018-05-16 09:51:17 -04:00
Sebastian Holtermann
3715d0fbcf Tests: Add QtAutogen test for a low cmake_minimum_required version 2018-05-16 09:11:45 +02:00
Kitware Robot
c698dbd45d CMake Nightly Date Stamp 2018-05-16 00:01:05 -04:00
Patrick Stotko
c9349cc1b9 target_link_libraries: Allow use with targets in other directories 
Previously the command did not allow naming targets on the LHS that
were not created in the calling directory.  Lift this restriction to
enable more flexible use by projects.

Fixes: #17943
 2018-05-15 10:22:35 -04:00
Brad King
743f24bac6 Merge branch 'release-3.11' 2018-05-15 10:16:32 -04:00
Brad King
92ce7cc230 Merge topic 'fix-automoc-warnings' 
9672d81ca3 Qt4Macros: Don't AUTOMOC or AUTOUIC qt4-generated files
800b2fcf80 Qt4Macros: Use get_property/set_property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2066
 2018-05-15 10:15:14 -04:00
Brad King
64234199ae Merge branch 'release-3.11' 2018-05-15 10:00:13 -04:00
Brad King
eaf8d7a1f4 Merge topic 'autogen_register_info_files' 
e461a136c1 Autogen: Register generated dependency files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2071
 2018-05-15 09:58:55 -04:00
Brad King
c29992078f Merge topic 'custom-command-expand-empty' 
6e59491659 add_custom_{command,target}: Fix crash on empty expanded command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2074
 2018-05-15 09:54:08 -04:00
Brad King
29d20e2e0c Merge branch 'fix-automoc-warnings' into release-3.11 
Merge-request: !2066
 2018-05-15 09:52:09 -04:00
Matthew Woehlke
9672d81ca3 Qt4Macros: Don't AUTOMOC or AUTOUIC qt4-generated files 
Suppress AUTOMOC and AUTOUIC on files generated by Qt4 wrapping macros;
particularly, those generated by `qt4_wrap_cpp`, `qt4_wrap_ui`, and
`qt4_add_resources`.  None of these should need AUTOMOC or AUTOUIC
treatment, and CMP0071 makes it important to mark this explicitly.
 2018-05-15 09:50:22 -04:00
Matthew Woehlke
800b2fcf80 Qt4Macros: Use get_property/set_property 
Replace use of old-style {get,set}_source_file_properties with newer
{get,set}_property.
 2018-05-15 09:48:11 -04:00
Michael Stürmer
71a033616a added CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION variable 
Fixes: #17955
 2018-05-15 09:00:31 +02:00
Kitware Robot
d793b482d9 CMake Nightly Date Stamp 2018-05-15 00:01:05 -04:00
Brad King
813bcc2997 Merge branch 'custom-command-expand-empty' into release-3.11 
Merge-request: !2074
 2018-05-14 11:59:51 -04:00
Brad King
6e59491659 add_custom_{command,target}: Fix crash on empty expanded command 
Our custom command generation logic assumes that all command lines have
at least `argv0`.  In `add_custom_{command,target}` we already check
that at least a `COMMAND` was given, but using `COMMAND_EXPAND_LISTS` in
combination with a generator expression that expands to an empty string
may produce an empty command line.  In this case simply add an empty
string as a command to maintain our internal invariant.

Fixes: #17993
 2018-05-14 11:54:27 -04:00
Brad King
99e658258e Merge topic 'FindPkgConfig-LINK_LIBRARIES' 
92ac721a44 FindPkgConfig: export the list of found libraries also as variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2068
 2018-05-14 09:46:31 -04:00
Brad King
5a227ce805 Merge topic 'cuda-vs-cuda-device-runtime' 
a170a59a58 VS: Link CUDA binaries with the device runtime library 'cudadevrt'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2062
 2018-05-14 09:42:00 -04:00
Brad King
7b62ec2451 Merge branch 'autogen_register_info_files' into release-3.11 
Merge-request: !2071
 2018-05-14 09:40:13 -04:00
Brad King
238c4820ff Merge branch 'release-3.11' 2018-05-14 09:39:36 -04:00
Brad King
6e39697ad5 Merge topic 'irsl-fortran-only-linux' 
05ece372a6 IRSL: Fix Intel library list for ifort-only setups

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2061
 2018-05-14 09:35:34 -04:00
Brad King
81ef418fe8 Merge topic 'update-kwsys' 
05d67d2545 Merge branch 'upstream-KWSys' into update-kwsys
55efd14733 KWSys 2018-05-11 (46da6b14)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2064
 2018-05-14 09:35:00 -04:00