reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-02-21 20:40:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
47,040 Commits 4 Branches 185 Tags
Commit Graph

47040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
2ee4b288ad Merge topic 'ninja-multi-framework-dependency-autogen-fix' 
665c8fde8b Merge branch 'backport-ninja-multi-framework-dependency-autogen-fix' into ninja-multi-framework-dependency-autogen-fix
7abc3d61ac Ninja Multi-Config: Fix issue with framework dependencies and Autogen

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4363
 2020-02-18 11:20:56 -05:00
Kitware Robot
3276f85fd7 CMake Nightly Date Stamp 2020-02-18 00:01:09 -05:00
KWSys Upstream
96dd383ceb KWSys 2020-02-17 (3e117fe1) 
Code extracted from:

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

at commit 3e117fe1e008aeca4a4f33a431b196848cc34e11 (master).

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

Brad King (1):
      c2420a42 SystemTools: Revert "CopyFileIfDifferent: Ensure that source is a file"

Julien Schueller (1):
      c3acc96d CMake: Fix psapi lib name on case-sensitive fs

Sebastian Lipponer (2):
      573713fa SystemTools: CopyFileIfDifferent: Ensure that source is a file
      ea77593a SystemTools: CopyFileIfDifferent: Fix endless recursion
 2020-02-17 11:59:07 -05:00
Brad King
fc6eced05e Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-02-17 (3e117fe1)
 2020-02-17 11:59:07 -05:00
Brad King
c78ae16d81 Add deprecation warnings for policies CMP0071 and below 
The OLD behaviors of all policies are deprecated, but only by
documentation.  Add an explicit deprecation diagnostic for policies
introduced in CMake 3.10 and below to encourage projects to port away
from setting policies to OLD.
 2020-02-17 11:44:57 -05:00
Joachim Wuttke (o)
466b138ea2 Help: string: regex match and replace is a subcase of Search&Replace 2020-02-17 17:42:50 +01:00
Joachim Wuttke (o)
22aac6669b Help: install: use bullet lists to sort out target kinds 2020-02-17 11:29:50 -05:00
Joachim Wuttke (o)
b3f4d50348 Help: ifw.rst: Add toc; mv "Hints" section -> subsection of "Variables" 
Also explain `@ApplicationsDir@`, thanks to
https://discourse.cmake.org/t/647/2 for help.
 2020-02-17 11:14:52 -05:00
Saleem Abdulrasool
321df5783d Swift: support -rpath for executables 
This adjusts the flags to enable setting the RPATH for executables.
 2020-02-17 11:07:40 -05:00
Yacoub Hossain
e6c470997f CPack/NuGet: Provide more granular errors 
Address the problem of not knowing when cpack fails to create a nuget
package which occurs when creating multiple nupkgs.

Fixes: #20094
 2020-02-17 11:01:08 -05:00
Kyle Edwards
665c8fde8b Merge branch 'backport-ninja-multi-framework-dependency-autogen-fix' into ninja-multi-framework-dependency-autogen-fix 2020-02-17 10:51:48 -05:00
Brad King
451360c729 Merge branch 'release-3.17' 2020-02-17 10:39:47 -05:00
Brad King
bf718ccd60 Merge topic 'git-config-with-spaces' into release-3.17 
ef3194a6f8 ExternalProject: Quote each git --config option to handle spaces
40d1d29cfa Tests: Add missing ExternalProject smoke tests
afc8956765 Tests: Fix test_clean target missing some test directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4364
 2020-02-17 10:39:46 -05:00
Brad King
0557e0b866 Merge topic 'git-config-with-spaces' 
ef3194a6f8 ExternalProject: Quote each git --config option to handle spaces
40d1d29cfa Tests: Add missing ExternalProject smoke tests
afc8956765 Tests: Fix test_clean target missing some test directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4364
 2020-02-17 10:39:46 -05:00
Brad King
b782fc9390 Merge topic 'makefiles-deep-configure' 
e46e3442fd Makefiles: Re-run CMake if file configured in subdirectory is missing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4359
 2020-02-17 10:26:05 -05:00
Joachim Wuttke (o)
c671966c20 Help: CPackComponent: Sectioning and rewording 
* Insert section and subsection headers (because this is a very long
    doc page)
* In the Introduction, first say that module is included automatically
* Then start with operational definition of components
* Remove duplications
* Also reword the description of the command cpack_add_component
 2020-02-17 16:12:15 +01:00
Kyle Edwards
7abc3d61ac Ninja Multi-Config: Fix issue with framework dependencies and Autogen 
Fixes: #20345
 2020-02-17 08:24:57 -05:00
Joachim Wuttke (o)
05e56b1897 Help: FetchContent, ExternalProject: Command sections -> subsections 2020-02-17 12:15:57 +01:00
Kitware Robot
6d00a2de7b CMake Nightly Date Stamp 2020-02-17 00:01:13 -05:00
Craig Scott
2d1aec3b2c Merge topic 'docs-cpack-typos' 
6a4743b2c3 Help: Correct typos in CPack docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4366
 2020-02-16 17:26:04 -05:00
Joachim Wuttke (h)
6a4743b2c3 Help: Correct typos in CPack docs 2020-02-17 08:20:53 +11:00
Kitware Robot
333a0507c0 CMake Nightly Date Stamp 2020-02-16 00:01:46 -05:00
Craig Scott
c76a719ab1 Merge topic 'doc-cpack' 
0ea52ece71 Help: module CPack: improve summary and Introduction
5c4d730dd4 Help: CPackComponent: improve summary and introduction
40da958d23 Help: CPack Archive Generator: Clarify source vs binary package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4354
 2020-02-15 16:22:45 -05:00
Kitware Robot
8be99c62ea CMake Nightly Date Stamp 2020-02-15 00:01:14 -05:00
Craig Scott
ef3194a6f8 ExternalProject: Quote each git --config option to handle spaces 
Fixes: #20354
 2020-02-15 13:23:56 +11:00
Craig Scott
40d1d29cfa Tests: Add missing ExternalProject smoke tests 2020-02-15 13:23:46 +11:00
Craig Scott
afc8956765 Tests: Fix test_clean target missing some test directories 2020-02-15 13:23:37 +11:00
Brad King
b78213e30b Merge topic 'update-libarchive' 
b83d96f164 libarchive: Update to build within CMake
5d8b3aec0c Merge branch 'upstream-LibArchive' into update-libarchive
8cce62295a LibArchive 2020-02-11 (3288ebb0)
9a27ecd416 libarchive: Update script to get 3.4.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4362
 2020-02-14 11:16:12 -05:00
Hugh Sorby
e46e3442fd Makefiles: Re-run CMake if file configured in subdirectory is missing 
Add files configured by all subdirectories to `CMAKE_MAKEFILE_PRODUCTS`
rather than just those from the top level.

Fixes: #19719
 2020-02-14 08:50:15 -05:00
Brad King
5ec88546dd Merge topic 'cpack-doc-ifw' 
fdf50941d2 Help: CPack IFW Generator: not only configures, but also runs QtIFW.
6bb248c133 Help: More cross references between CPackIFW and CPackIFWGenerator.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4356
 2020-02-14 08:40:36 -05:00
Brad King
add917754f Merge topic 'doc-install-dest' 
79e1d86d2c Help: command install: absolute paths unsupported by CPack

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4355
 2020-02-14 08:39:49 -05:00
Joachim Wuttke (o)
0ea52ece71 Help: module CPack: improve summary and Introduction 
* In summary:
  * we configure generators, not the generated installers
  * we generate installers or source packages, not source package installers

* In Introduction:
  * Make paragraph on binary installers more concise
  * Remove example that refered to CMake source tree
  * Add paragraph on source packages
  * omit the parenthesis on graphical installers
 2020-02-14 21:49:47 +11:00
Joachim Wuttke (o)
5c4d730dd4 Help: CPackComponent: improve summary and introduction 
Also:
* provide some hyperlinks
* update parenthesis on graphical installers (no longer restricted
  to Win and macOS)
 2020-02-14 21:49:22 +11:00
Joachim Wuttke (o)
40da958d23 Help: CPack Archive Generator: Clarify source vs binary package 
- Simplify summary
- Revise introduction:
  - Explain how to package source files, provide configuration sample
  - Clarify source vs binary package
- Clarify meaning of variables
   (Mandatory=ON makes no sense if a default is defined)
 2020-02-14 21:47:08 +11:00
Kitware Robot
4bfe0b6f0d CMake Nightly Date Stamp 2020-02-14 00:01:07 -05:00
Brad King
b83d96f164 libarchive: Update to build within CMake 
Hard-code more libarchive options as internal cache entries.  Doing so
makes some of our `IF(0)` conditions unnecessary, so remove those.
 2020-02-13 12:59:29 -05:00
Brad King
5d8b3aec0c Merge branch 'upstream-LibArchive' into update-libarchive 
* upstream-LibArchive:
  LibArchive 2020-02-11 (3288ebb0)

Also manually restore content from upstream libarchive's main
`CMakeLists.txt` file that was removed by previous commits and
exclude it with `IF(0)` blocks.  Do this as an evil merge so
that `git blame -C` can follow the content to upstream.
 2020-02-13 12:57:52 -05:00
LibArchive Upstream
8cce62295a LibArchive 2020-02-11 (3288ebb0) 
Code extracted from:

    https://github.com/libarchive/libarchive.git

at commit 3288ebb0353beb51dfb09d444dedbe9235ead53d (v3.4.2).
 2020-02-13 12:57:28 -05:00
Brad King
9a27ecd416 libarchive: Update script to get 3.4.2 2020-02-13 12:57:20 -05:00
Joachim Wuttke (o)
fdf50941d2 Help: CPack IFW Generator: not only configures, but also runs QtIFW. 2020-02-13 08:46:04 +01:00
Joachim Wuttke (o)
6bb248c133 Help: More cross references between CPackIFW and CPackIFWGenerator. 
And more concise section "QtIFW Tools".
 2020-02-13 08:14:07 +01:00
Kitware Robot
1acea5cb26 CMake Nightly Date Stamp 2020-02-13 00:01:12 -05:00
Brad King
b88a671f75 Merge topic 'doc-ascii' into release-3.17 
c5d7c29137 Help: Replace UTF-8 apostrophe with ascii apostrophe

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4358
 2020-02-12 15:04:41 -05:00
Brad King
4d19e9b769 Merge branch 'release-3.17' 2020-02-12 15:04:41 -05:00
Brad King
d8daaf0bc3 Merge topic 'doc-ascii' 
c5d7c29137 Help: Replace UTF-8 apostrophe with ascii apostrophe

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4358
 2020-02-12 15:04:41 -05:00
Brad King
c5d7c29137 Help: Replace UTF-8 apostrophe with ascii apostrophe 
Also replace UTF-8 graphical characters with simple dashes.

Fixes: #20349
 2020-02-12 14:37:41 -05:00
Joachim Wuttke (o)
79e1d86d2c Help: command install: absolute paths unsupported by CPack 
Advise against absolute DESTINATIONs as they are not supported
by CPack installer generators.
 2020-02-12 19:40:04 +01:00
Brad King
85fdac46bd Merge branch 'release-3.17' 2020-02-12 12:05:41 -05:00
Kyle Edwards
72229159d7 Merge topic 'ninja-strcat-usage' 
6e65b869c3 cmNinjaTargetGenerator: cmStrCat usage
9f6544048f cmGlobalNinjaGenerator: cmStrCat usage
04ac0ea501 cmGlobalNinjaGenerator: factor out /all target name computation
a85bea173a cmGlobalNinjaGenerator: avoid unnecessary string addition

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4347
 2020-02-12 11:59:21 -05:00
Brad King
125f0451a9 CMake 3.17.0-rc1 v3.17.0-rc1 2020-02-12 10:32:47 -05:00