reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-02-23 05:22:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
35,535 Commits 4 Branches 185 Tags
Commit Graph

35535 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
26b5f7defe Merge topic 'update-kwsys' 
ada8e0ca Merge branch 'upstream-KWSys' into update-kwsys
85841e8b KWSys 2017-04-12 (23a4c211)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !694
 2017-04-13 08:13:12 -04:00
Brad King
8456ec833a Merge topic 'include-style' 
1d829c86 Use quotes for non-system includes
26ee9e42 CPack: drop CPack prefix for includes
5afac50f cmConfigure: Ensure separate include block in headers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !691
 2017-04-13 08:12:40 -04:00
Kitware Robot
f79b8fad09 CMake Nightly Date Stamp 2017-04-13 00:01:14 -04:00
Brad King
ada8e0cac4 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-04-12 (23a4c211)
 2017-04-12 09:10:22 -04:00
KWSys Upstream
85841e8bd5 KWSys 2017-04-12 (23a4c211) 
Code extracted from:

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

at commit 23a4c211e90c1cfd399c3632141dbd549a5db8cf (master).

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

Brad King (2):
      41a9dfef SystemInformation: Fix dynamic loader failure on WinXP SP2
      3ead6158 SystemTools: Fix stat() wrapper compilation with Borland

Daniel Pfeifer (1):
      ce5b0d34 Disable include-what-you-use

Mathieu Westphal (1):
      a2bf6bb3 SystemTools: Add cross-platform stat() wrapper
 2017-04-12 09:10:22 -04:00
Brad King
fddd559406 Merge topic 'vs-refactor-source-loop' 
a2e91af9 cmGeneratorTarget: Drop unused GetIDLSources method
a77158b2 VS: Refactor loop over classified sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !689
 2017-04-12 09:05:49 -04:00
Brad King
80ea73f288 Merge topic 'xcode-object-arch-dir' 
8c346bbc Xcode: Compute a concrete object file arch dir if possible
5f4e26df Xcode: Refactor object directory name computation
5b29fd6d Xcode: Refactor internal architecture list construction
b1eb493c cmGlobalGenerator: Abort generation earlier on export() error

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !688
 2017-04-12 09:05:29 -04:00
Brad King
9c03f503a7 Merge topic 'update-kwiml' 
5a53e18e Merge branch 'upstream-KWIML' into update-kwiml
93542c89 KWIML 2017-04-11 (ffc22537)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !690
 2017-04-12 09:04:32 -04:00
Brad King
35d81b69fa Merge topic 'doc-cmake-E-copy-no-wildcards' 
6e68d014 Help: Add note about cmake -E copy not supporting wildcards

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !687
 2017-04-12 09:04:14 -04:00
Brad King
6f7f567eee Merge topic 'macos-hidpi-qt-dialog' 
d9140305 macOS: Enable Hi-DPI support in applications by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !682
 2017-04-12 09:03:50 -04:00
Kitware Robot
135611176c CMake Nightly Date Stamp 2017-04-12 00:01:04 -04:00
Daniel Pfeifer
1d829c862c Use quotes for non-system includes 
Automate with:

git grep -l '#include <cm_' -- Source \
  | xargs sed -i 's/#include <\(cm_.*\)>/#include "\1"/g'

git grep -l '#include <cmsys/' -- Source \
  | xargs sed -i 's/#include <\(cmsys\/.*\)>/#include "\1"/g'

git grep -l '#include <cm[A-Z]' -- Source \
  | xargs sed -i 's/#include <\(cm[A-Z].*\)>/#include "\1"/g'
 2017-04-11 22:35:21 +02:00
Daniel Pfeifer
26ee9e4291 CPack: drop CPack prefix for includes 
Automate with:

git grep -l '#include <CPack/' -- Source \
  | xargs sed -i 's/#include <CPack\/\(.*\)>/#include "\1"/g'

git grep -l '#include "CPack/' -- Source \
  | xargs sed -i 's/#include "CPack\/\(.*\)"/#include "\1"/g'
 2017-04-11 22:35:20 +02:00
Daniel Pfeifer
5afac50f68 cmConfigure: Ensure separate include block in headers 
Make sure that `#include <cmConfigure.h>` is followed by an empty line
in header files.  This is necessary to make sure that changing <> to ""
does not affect the include ordering of clang-format.

Automate with:

git grep -l '#include <cmConfigure.h>' | grep -v '.cxx$' \
| xargs sed -i '/#include <cmConfigure.h>/ { N; N; s/\n\{1,2\}/\n\n/ }'
 2017-04-11 22:35:20 +02:00
Brad King
5a53e18e24 Merge branch 'upstream-KWIML' into update-kwiml 
* upstream-KWIML:
  KWIML 2017-04-11 (ffc22537)
 2017-04-11 15:32:48 -04:00
KWIML Upstream
93542c897d KWIML 2017-04-11 (ffc22537) 
Code extracted from:

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

at commit ffc22537fabc40548b3de4a759303caaeea83646 (master).

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

Daniel Pfeifer (1):
      ffc22537 test: Disable include-what-you-use
 2017-04-11 15:32:48 -04:00
Brad King
a2e91af99d cmGeneratorTarget: Drop unused GetIDLSources method 2017-04-11 13:36:40 -04:00
Brad King
a77158b25f VS: Refactor loop over classified sources 
Loop over all sources at once instead of looking up and looping
over each kind of source separately.
 2017-04-11 13:36:31 -04:00
Brad King
8c346bbc6e Xcode: Compute a concrete object file arch dir if possible 2017-04-11 11:40:15 -04:00
Brad King
5f4e26dfc8 Xcode: Refactor object directory name computation 
Factor out a helper function to compute the object directory name
architecture component.
 2017-04-11 11:40:15 -04:00
Brad King
5b29fd6d4d Xcode: Refactor internal architecture list construction 
Factor population of the `Architectures` member out into a helper to
avoid duplication.
 2017-04-11 11:40:15 -04:00
Brad King
b1eb493c11 cmGlobalGenerator: Abort generation earlier on export() error 2017-04-11 11:40:14 -04:00
Brad King
ff4fa70c20 Merge topic 'vs-remove-UseObjectLibraries' 
f4af14ad VS: Simplify logic collecting object library files as sources
10772c51 VS: Simplify use of object libraries in WINDOWS_EXPORT_ALL_SYMBOLS
22829a13 cmMakefile: Create an explicit "Object Libraries" source group

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !686
 2017-04-11 11:28:05 -04:00
Tim
6e68d014d5 Help: Add note about cmake -E copy not supporting wildcards 
Issue: #16791
 2017-04-11 10:26:16 -04:00
Brad King
85d2434826 Merge topic 'FindPythonInterp-3.6-windows' 
9d15d3c7 FindPythonInterp: Add `-32` and `-64` registry entry variants

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !675
 2017-04-11 10:11:42 -04:00
Brad King
f4af14add4 VS: Simplify logic collecting object library files as sources 
Object library files are already included by `GetExternalObjects`
and `GetConfigCommonSourceFiles` so we don't need to call
`UseObjectLibraries` to get them.
 2017-04-11 10:10:28 -04:00
Brad King
10772c51b4 VS: Simplify use of object libraries in WINDOWS_EXPORT_ALL_SYMBOLS 
Object library files are already included by `GetExternalObjects`
so we don't need to call `UseObjectLibraries` to get them.
 2017-04-11 10:10:27 -04:00
Brad King
22829a1304 cmMakefile: Create an explicit "Object Libraries" source group 
The generators should not need special logic to place object library
object files in this group.
 2017-04-11 10:09:57 -04:00
Ľubomír Carik
d914030507 macOS: Enable Hi-DPI support in applications by default 
Every desktop application should be HiDPI ready in present.
Based on information from Qt documentation enabling properties in
`Info.plist` is sufficient to activate this feature.
Newer versions of `qmake` do it.

Signed-off-by: Ľubomír Carik <Lubomir.Carik@gmail.com>
 2017-04-11 09:49:12 -04:00
Kitware Robot
e086b0e081 CMake Nightly Date Stamp 2017-04-11 00:01:05 -04:00
Brad King
0419ecbcad Merge branch 'release' 2017-04-10 12:53:10 -04:00
Brad King
da7833c5bb CMake 3.8.0 v3.8.0 2017-04-10 11:16:00 -04:00
Brad King
b08d2092df Merge branch 'release' 2017-04-10 11:15:18 -04:00
Brad King
dafddda479 Merge topic 'vs-rc-defines' 
89b92a98 RC: Mark CMAKE_RC_FLAGS_<CONFIG> cache entries as advanced

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !685
 2017-04-10 11:14:35 -04:00
Brad King
a6a0cfb24d Merge branch 'vs-rc-defines' into release 2017-04-10 11:08:26 -04:00
Brad King
89b92a98a5 RC: Mark CMAKE_RC_FLAGS_<CONFIG> cache entries as advanced 
These were added by commit v3.8.0-rc4~4^2~1 (RC: Add missing
CMAKE_RC_FLAGS_<CONFIG> entries to cache, 2017-03-28) and should be
advanced as they are for other languages.
 2017-04-10 11:07:14 -04:00
Brad King
1136cbd476 Merge branch 'release' 2017-04-10 10:18:32 -04:00
Brad King
23fccf30b0 Merge topic 'packaging-qtsdk' 
94420a7b QtIFW: Improved packaging as part of the QtSDK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !678
 2017-04-10 10:06:03 -04:00
Brad King
e265ddecfc Merge branch 'packaging-qtsdk' into release 2017-04-10 10:04:51 -04:00
Brad King
7b51c1c789 Merge topic 'emulatorTargetPropertyDocs' 
186dd877 Help: Cross compile variable used as initial value for target property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !683
 2017-04-10 10:01:31 -04:00
Brad King
5e95a99088 Merge topic 'clarifyFileGenerateDocs' 
d039f741 Help: Clarify file(GENERATE) only writes output file at generation phase

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !681
 2017-04-10 10:01:11 -04:00
Brad King
54d8c0db00 Merge topic 'clarifyRemoveDocs' 
812274ff Help: Clarify what the -f option does for the remove command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !680
 2017-04-10 10:00:58 -04:00
Brad King
63a57d1bd9 Merge branch 'emulatorTargetPropertyDocs' into release 2017-04-10 09:58:57 -04:00
Brad King
07790796fc Merge branch 'clarifyFileGenerateDocs' into release 2017-04-10 09:58:52 -04:00
Craig Scott
d039f7414f Help: Clarify file(GENERATE) only writes output file at generation phase 
Closes: #16556
 2017-04-10 09:58:22 -04:00
Brad King
07cc72502d Merge branch 'clarifyRemoveDocs' into release 2017-04-10 09:53:14 -04:00
Craig Scott
186dd8771e Help: Cross compile variable used as initial value for target property 
Variable CMAKE_CROSSCOMPILING_EMULATOR is used to initialize
CROSSCOMPILING_EMULATOR.

Issue: #16785
 2017-04-10 09:52:58 -04:00
Craig Scott
812274ff49 Help: Clarify what the -f option does for the remove command 
Closes: #16784
 2017-04-10 09:50:10 -04:00
Robert Dailey
9d15d3c748 FindPythonInterp: Add -32 and -64 registry entry variants 
As of 3.6.1 Python (only version tested in this case), installing 32-bit
version on 64-bit windows has a slightly different registry key path.
`-32` is appended to the end of the version number in the path.  Also
added a few more registry path guesses based on 64-bit version of
Python.

Also the module now checks if the host is WIN32 instead of the target,
which is required if you are cross compiling.
 2017-04-10 09:47:04 -04:00
Brad King
730a548055 Merge topic 'FindwxWidgets-new-syslibs' 
ae4b3b70 FindwxWidgets: link with the new required libs under MSW

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !676
 2017-04-10 09:42:53 -04:00