mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-06 06:38:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
39,695 Commits 2 Branches 392 Tags
2d480a1c149da5c314be8f6f01b8f90d239c2db5
Commit Graph

39695 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot
2d480a1c14 CMake Nightly Date Stamp 2018-05-24 00:01:04 -04:00
Kitware Robot
0e6bc9d025 CMake Nightly Date Stamp 2018-05-23 00:01:05 -04:00
Kitware Robot
e6a32f0525 CMake Nightly Date Stamp 2018-05-22 00:01:11 -04:00
Brad King
90e7103fc6 Merge topic 'pr.copy_data_check' 
a203fcc63d cmake: Teach '-E tar' to report errors copying data

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2075
 2018-05-21 11:05:42 -04:00
Brad King
5915c5bf55 Merge topic 'cpackrpm-fix-docs' 
78f0dcdcc9 CPackRPM: Fix misleading CPACK_RPM_SPEC_INSTALL_POST docs
2ae2f0ca98 CPackRPM: Minor formatting cleanup

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2070
 2018-05-21 11:04:56 -04:00
Brad King
64ec064212 Merge topic 'eclipse-custom-content' 
fd0da95f63 Eclipse: Add property to include additional contents in .cproject file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2088
 2018-05-21 11:04:04 -04:00
Brad King
7b42ffce09 Merge topic 'PDBDirectoryGenExpression' 
79ca546ed2 Add generator expression support to PDB_OUTPUT_DIRECTORY target property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2083
 2018-05-21 11:02:42 -04:00
Marian Klymov
79ca546ed2 Add generator expression support to PDB_OUTPUT_DIRECTORY target property 
Fixes: #16365
 2018-05-21 11:00:12 -04:00
Brad King
963a33f4a8 Merge topic 'vs-remove-stream' 
790fc415b1 cmVisualStudio10TargetGenerator: remove BuildFileStream member

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2082
 2018-05-21 10:58:53 -04:00
Brad King
722056372e Merge topic 'update-curl' 
3e913b819d Merge branch 'upstream-curl' into update-curl
d431136e02 curl 2018-05-15 (cb013830)
f3c73b878c curl: Update script to get curl 7.60.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2091
 2018-05-21 09:53:06 -04:00
Brad King
4d6f4500df Merge topic 'update-kwsys' 
b730097788 Merge branch 'upstream-KWSys' into update-kwsys
1f52cb087a KWSys 2018-05-18 (5357cfc4)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2090
 2018-05-21 09:52:08 -04:00
Kitware Robot
e5463ec917 CMake Nightly Date Stamp 2018-05-21 00:01:05 -04:00
Kitware Robot
32cf27ada5 CMake Nightly Date Stamp 2018-05-20 00:01:08 -04:00
Kitware Robot
76affcb6b4 CMake Nightly Date Stamp 2018-05-19 00:01:07 -04:00
Brad King
68be3618dc Merge topic 'clang-format-version' 
8cfc45f6bd clang-format: Explicitly require version 3.8 of the tool

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2086
 2018-05-18 11:10:53 -04:00
Brad King
3e913b819d Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2018-05-15 (cb013830)
 2018-05-18 10:16:50 -04:00
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