reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-02-25 14:41:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
38,022 Commits 4 Branches 185 Tags
Commit Graph

38022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
1fe9e49bad Merge topic 'rel-win-static' 
313a5657 Utilities/Release: Build static executables on Windows
a12830c2 Utilities/Release: Remove unused setting in Linux build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1477
 2017-11-14 07:30:07 -05:00
Brad King
d0606946d7 Merge branch 'release-3.10' 2017-11-14 07:29:09 -05:00
Brad King
313a565729 Utilities/Release: Build static executables on Windows 
Switch to the MSVC static runtime library (and static UCRT).
Link Qt statically, including the Windows platform plugin.
Disable the Qt tests because they are incompatible with a
Qt using a static runtime library.
 2017-11-14 07:26:36 -05:00
Brad King
a12830c2fd Utilities/Release: Remove unused setting in Linux build 
CMake_INSTALL_DEPENDENCIES is not needed because we link both
Qt and the toolchain runtime library statically.
 2017-11-14 07:26:36 -05:00
Brad King
6c23107725 Merge topic 'cmake-gui-qt-static-windows' 
3a993c49 Tests: Add options to disable tests requiring Qt
27a73f16 cmake-gui: Add build option to use Qt5 windows plugin statically

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1476
 2017-11-14 07:23:40 -05:00
Brad King
8203895caa Merge topic 'xcode64' 
23dd8b9e cmGlobalXCodeGenerator: Support XCTest for XCode 6.4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1471
 2017-11-14 07:22:42 -05:00
Brad King
269ea83eb2 Merge branch 'cmake-gui-qt-static-windows' into release-3.10 
Merge-request: !1476
 2017-11-14 07:19:51 -05:00
Kitware Robot
7a06f9973a CMake Nightly Date Stamp 2017-11-14 00:02:18 -05:00
Brad King
3a993c49db Tests: Add options to disable tests requiring Qt 2017-11-13 13:58:32 -05:00
Brad King
b77501d4c7 Merge topic 'ctest-warning' 
ec2f9012 CTest: correct misleading warning message for RUN_SERIAL tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Zack Galbreath <zack.galbreath@kitware.com>
Merge-request: !1469
 2017-11-13 09:56:46 -05:00
Brad King
27a73f1613 cmake-gui: Add build option to use Qt5 windows plugin statically 
This will enable builds against a static Qt5 on Windows.
 2017-11-13 09:54:49 -05:00
Brad King
ac38bb3aa6 Merge topic 'swig-broken-dependency-scan' 
2ee10119 swig: fix incremental build in case of removed interface files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1457
 2017-11-13 09:53:51 -05:00
Brad King
b62eb8f697 Merge topic 'xcodeForLoopCleanup' 
98cbcedd Xcode: use ranged for loops, cleanup existing for loops

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1456
 2017-11-13 09:52:43 -05:00
Kitware Robot
67c981fdc2 CMake Nightly Date Stamp 2017-11-13 00:01:06 -05:00
Kitware Robot
b1a06e4726 CMake Nightly Date Stamp 2017-11-12 00:01:04 -05:00
Kitware Robot
5d3b917d38 CMake Nightly Date Stamp 2017-11-11 00:03:54 -05:00
Brad King
d23a0c4d0e Merge branch 'release-3.10' 2017-11-10 11:40:59 -05:00
Brad King
78f5d571e4 CMake 3.10.0-rc5 v3.10.0-rc5 2017-11-10 10:46:29 -05:00
Brad King
5c887742c5 Merge branch 'release-3.10' 2017-11-10 10:44:15 -05:00
Brad King
98a78f3450 Merge branch 'windows-mt-update-quiet' into release-3.10 
Merge-request: !1470
Merge-request: !1473
 2017-11-10 10:42:31 -05:00
Brad King
2201ecec44 Windows: Do not report manifest tool update notification as failure 
A diagnostic message added in commit v3.10.0-rc1~59^2 (Windows: Improve
link-time error messages when rc or mt fail, 2017-09-22) incorrectly
reports the `mt /notify_update` special return code as a failure.
Fix the logic to consider the special return codes as success.

Fixes: #17444
 2017-11-10 10:41:50 -05:00
Brad King
11e2f53e30 Merge topic 'windows-mt-update-quiet' 
5c07d390 cmcmd: Fix typo in RunCommand logic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1473
 2017-11-10 10:41:15 -05:00
Brad King
5c07d3900d cmcmd: Fix typo in RunCommand logic 
Fix logic added by commit 18eae3f04d (Windows: Do not report manifest
tool update notification as failure, 2017-11-09).

Issue: #17444
 2017-11-10 10:37:26 -05:00
Brad King
fa5090b441 Merge branch 'doxygen_dot' into release-3.10 
Merge-request: !1472
 2017-11-10 10:34:34 -05:00
Brad King
fd93616b74 Merge topic 'doxygen_dot' 
9cab8570 FindDoxygen: Fix setting of HAVE_DOT in non-backward-compat mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1472
 2017-11-10 10:30:16 -05:00
André Apitzsch
9cab8570fa FindDoxygen: Fix setting of HAVE_DOT in non-backward-compat mode 
`DOXYGEN_DOT_FOUND` is only set if `_Doxygen_keep_backward_compat` is
used (when no components are requested), so use `Doxygen_dot_FOUND`
directly.  Preserve the "YES" or "NO" value used previously.
 2017-11-10 08:49:37 -05:00
Brad King
1a6ef0bdb2 Merge branch 'release-3.9' 2017-11-10 08:36:46 -05:00
Brad King
163be8714a Merge topic 'update-ctest-documentation' 
3b272ff8 Help: Add 'Label and Subproject Summary' section to ctest(1) manual
002d0a1c Help: Normalize capitalization of 'CTest' in ctest(1) manual
9d3aa95c Help: Divide ctest(1) manual options into sections
7904b659 Tests: Remove incorrect use of 'test-timeout' option
e80dc2ad cmCTest: Remove dead code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1427
 2017-11-10 08:05:45 -05:00
Betsy McPhail
3b272ff8e4 Help: Add 'Label and Subproject Summary' section to ctest(1) manual 2017-11-10 07:53:45 -05:00
Betsy McPhail
002d0a1cf9 Help: Normalize capitalization of 'CTest' in ctest(1) manual 2017-11-10 07:53:42 -05:00
Betsy McPhail
9d3aa95ca4 Help: Divide ctest(1) manual options into sections 2017-11-10 07:52:45 -05:00
Betsy McPhail
7904b659ea Tests: Remove incorrect use of 'test-timeout' option 2017-11-10 07:52:05 -05:00
Brad King
38bb98de51 Merge topic 'cmakeServerRequiredCMakeVersion' 
cdf5f34b server: return minimum cmake required version for each project

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1462
 2017-11-10 07:51:13 -05:00
Brad King
78def0e257 Merge topic 'csharp-settings-property' 
15892aa3 VS: Fix warnings in generated references to '.settings' files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1450
 2017-11-10 07:50:00 -05:00
Brad King
9aaf287d63 Merge topic 'test-CTestTest2-intl' 
9ffb9cb8 Tests: In CTestTest2 configure KWSys encoding to match CMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1468
 2017-11-10 07:42:48 -05:00
Brad King
83e207a54e CMake 3.9.6 v3.9.6 2017-11-10 07:37:49 -05:00
Brad King
c1a55e333f Merge topic 'update-kwsys' 
8bef3e31 Merge branch 'upstream-KWSys' into update-kwsys
e8d0b431 KWSys 2017-11-09 (40d7b1bb)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1467
 2017-11-10 07:34:24 -05:00
Brad King
6d20c44f3d Merge topic 'windows-mt-update-quiet' 
18eae3f0 Windows: Do not report manifest tool update notification as failure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1470
 2017-11-10 07:31:55 -05:00
Craig Scott
0d7086e3da Merge topic 'fetchcontent-support-use-before-project-command' 
b551beb6 FetchContent: Support use of the module before "project()" command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1448
 2017-11-10 00:24:50 -05:00
Craig Scott
98cbcedd74 Xcode: use ranged for loops, cleanup existing for loops 
The changes are mostly converting old-style explicit iterator for loops
into ranged for statements. A number of for loops had already been
changed over, but local variables had been left behind instead of being
absorbed into the ranged for statement, so these have been cleaned up
too. A couple of minor improvements were made in areas already being
updated by the for loop changes to slightly simplify the code or to
avoid unnecessary conversions between `const char*` and `std::string`.
 2017-11-10 13:12:57 +08:00
Kitware Robot
6afc841e74 CMake Nightly Date Stamp 2017-11-10 00:01:14 -05:00
Brad King
d9bc6fd451 Merge branch 'release-3.10' 2017-11-09 13:19:36 -05:00
Brad King
c167a9b18c Merge topic 'FindOpenGL-no-glvnd-for-GL' 
e6b209c8 FindOpenGL: Default to non-GLVND libraries for legacy GL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1466
 2017-11-09 13:17:41 -05:00
Brad King
1f15324824 Merge branch 'FindOpenGL-no-glvnd-for-GL' into release-3.10 
Merge-request: !1466
 2017-11-09 13:13:54 -05:00
Benito Palacios Sanchez
23dd8b9e93
cmGlobalXCodeGenerator: Support XCTest for XCode 6.4 2017-11-09 17:49:36 +01:00
Yoshinori Tahara
15892aa3c0 VS: Fix warnings in generated references to '.settings' files 
According to MSDN docs [1], LastGenOutput is just a file name.

[1] https://msdn.microsoft.com/en-us/library/bb629388.aspx
 2017-11-09 11:48:38 -05:00
Brad King
18eae3f04d Windows: Do not report manifest tool update notification as failure 
A diagnostic message added in commit v3.10.0-rc1~59^2 (Windows: Improve
link-time error messages when rc or mt fail, 2017-09-22) incorrectly
reports the `mt /notify_update` special return code as a failure.
Fix the logic to consider the special return codes as success.

Fixes: #17444
 2017-11-09 11:22:00 -05:00
Brad King
e6b209c870 FindOpenGL: Default to non-GLVND libraries for legacy GL 
Projects using `OPENGL_LIBRARIES` or `OpenGL::GL` expect legacy GL.
Although GLVND OpenGL+GLX provides legacy GL interfaces, using those
library files may conflict with legacy GL library files used by
dependencies (or dependents) of such projects.  Therefore we should
not yet use OpenGL+GLX when a legacy GL library is available.

If `OPENGL_gl_LIBRARY` is set then use it as the legacy GL library.
If it is *not* set then fall back to using GLVND OpenGL+GLX to provide
legacy GL interfaces.  This will allow users to build projects using
GLVND even if they have not been ported.

Fixes: #17437
 2017-11-09 09:47:12 -05:00
Wouter Klouwen
ec2f901202 CTest: correct misleading warning message for RUN_SERIAL tests 
As reported in issue 17167, when only RUN_SERIAL tests remain, CTest can
display a misleading message that it is waiting for the load to come
down when in fact, it cannot start any new tests.

This commit fixes that by determining whether this circumstance is
what's happening and adds an additional warning message in this case.
 2017-11-09 13:53:50 +00:00
Brad King
8bef3e31bd Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-11-09 (40d7b1bb)
 2017-11-09 08:35:51 -05:00