reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-03-01 08:25:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
45,891 Commits 4 Branches 185 Tags
Commit Graph

45891 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
9112933a6c Merge branch 'release-3.16' 2019-11-18 13:43:12 -05:00
Brad King
9c9bbedd31 Merge topic 'swift-rpath-darwin' 
ff6c336127 Swift: support `-rpath` on Darwin

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4059
 2019-11-18 13:43:11 -05:00
Brad King
3a87ce6c96 Merge topic 'swift-rpath-darwin' into release-3.16 
ff6c336127 Swift: support `-rpath` on Darwin

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4059
 2019-11-18 13:43:11 -05:00
Brad King
3bc808fc33 Merge branch 'release-3.16' 2019-11-18 13:42:09 -05:00
Brad King
eead6a2504 Merge topic 'swift-darwin-install-name' 
f935de6746 Swift: support `INSTALL_NAME_DIR` on Darwin

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4060
 2019-11-18 13:42:09 -05:00
Brad King
4bbd9e9ec4 Merge topic 'swift-darwin-install-name' into release-3.16 
f935de6746 Swift: support `INSTALL_NAME_DIR` on Darwin

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4060
 2019-11-18 13:42:08 -05:00
Saleem Abdulrasool
ff6c336127 Swift: support -rpath on Darwin 
Darwin also has the concept of RPATH.  Additionally, the flag is
identical to that on other Unixish platforms.  Simply avoid the `-rpath`
handling on Windows.

This enables the use of `BUILD_WITH_INSTALL_RPATH` and `INSTALL_RPATH`
with Swift targets on Darwin.
 2019-11-18 10:04:09 -05:00
Saleem Abdulrasool
f935de6746 Swift: support INSTALL_NAME_DIR on Darwin 
Adjust the shared object rule to ensure that we honour the
`INSTALL_NAME_DIR` property on Swift targets.  This enables the use of
`INSTALL_NAME_DIR` and `BUILD_WITH_INSTALL_NAME_DIR` on Darwin with
Ninja.
 2019-11-18 10:02:50 -05:00
Brad King
cbedead9a2 Merge branch 'release-3.16' 2019-11-18 09:54:15 -05:00
Brad King
e64d39eb42 Merge topic 'compile-features-other-lang' into release-3.16 
229f2cc5fd Help: Clarify compile features handling for OBJC and OBJCXX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4057
 2019-11-18 09:54:15 -05:00
Brad King
26f3cb3288 Merge topic 'compile-features-other-lang' 
229f2cc5fd Help: Clarify compile features handling for OBJC and OBJCXX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4057
 2019-11-18 09:54:15 -05:00
Brad King
776d1e5e79 Merge topic 'win-no-error-popup' 
a4c19cb895 Windows: Restore suppression of error report popups in CI builds
0b9f1cc96b Merge branch 'upstream-KWSys' into win-no-error-popup
9e27e52d4b KWSys 2019-11-15 (329d8c7c)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4052
 2019-11-18 09:52:13 -05:00
Brad King
c80dfa0d5b Merge branch 'release-3.16' 2019-11-18 09:50:58 -05:00
Brad King
1c09b8c164 Merge topic 'cpack-custom-templates' into release-3.16 
7d6ab5dc5b CPack: Restore support for custom package configuration templates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4054
 2019-11-18 09:50:57 -05:00
Brad King
0e46dea343 Merge topic 'cpack-custom-templates' 
7d6ab5dc5b CPack: Restore support for custom package configuration templates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4054
 2019-11-18 09:50:57 -05:00
Brad King
bd16555717 Merge topic 'CPackNuget-dep-id' 
26367b4bb2 CPack/NuGet: Do not mangle non-C-identifier chars in dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4044
 2019-11-18 09:50:14 -05:00
Brad King
e2cb9bcef2 Merge branch 'release-3.16' 2019-11-18 09:47:36 -05:00
Brad King
667a88e260 Merge topic 'docs-pch-reorg' into release-3.16 
cc88ede7a3 Help: Provide guidance on INTERFACE for target_precompile_headers()
dae9a808fe Help: Reorganise target_precompile_headers() docs for readability

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4045
 2019-11-18 09:47:35 -05:00
Brad King
498e3e67b3 Merge topic 'docs-pch-reorg' 
cc88ede7a3 Help: Provide guidance on INTERFACE for target_precompile_headers()
dae9a808fe Help: Reorganise target_precompile_headers() docs for readability

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4045
 2019-11-18 09:47:35 -05:00
Brad King
6cb9867ba3 Merge topic 'pch-reuse-no-prop' into release-3.16 
bb4c2781ce PCH: Do not issue an error on duplicate target_precompile_headers call

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4046
 2019-11-18 09:46:26 -05:00
Brad King
b60563fee8 Merge branch 'release-3.16' 2019-11-18 09:46:26 -05:00
Brad King
e14c9af013 Merge topic 'pch-reuse-no-prop' 
bb4c2781ce PCH: Do not issue an error on duplicate target_precompile_headers call

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4046
 2019-11-18 09:46:26 -05:00
Craig Scott
fc4f00cbf6 Merge topic 'tutorial-replace-unicode-dash' into release-3.16 
02aa03eb0a Tutorial: replace Unicode EN DASH with ASCII dash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4058
 2019-11-18 05:50:02 -05:00
Craig Scott
f63d84c37c Merge branch 'release-3.16' 2019-11-18 05:50:02 -05:00
Craig Scott
4ea992ab32 Merge topic 'tutorial-replace-unicode-dash' 
02aa03eb0a Tutorial: replace Unicode EN DASH with ASCII dash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4058
 2019-11-18 05:50:02 -05:00
Craig Scott
1bd06579a3 Merge topic 'ccmake_redirect_stdstreams' 
88cfef0821 ccmake: redirect stdout/stderr to the displayed logs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4005
 2019-11-18 05:46:31 -05:00
Kitware Robot
e56e9c14c5 CMake Nightly Date Stamp 2019-11-18 00:01:09 -05:00
Arkadiusz Drabczyk
02aa03eb0a Tutorial: replace Unicode EN DASH with ASCII dash 
Unicode EN DASH is problematic:

- it cannot be easily found in web browsers, editors etc.
- it doesn't work when copied and run in the terminal
 2019-11-18 06:51:58 +11:00
Craig Scott
229f2cc5fd Help: Clarify compile features handling for OBJC and OBJCXX 2019-11-17 17:50:56 +11:00
Kitware Robot
cf598311ce CMake Nightly Date Stamp 2019-11-17 00:01:06 -05:00
Sylvain Joubert
88cfef0821 ccmake: redirect stdout/stderr to the displayed logs 
Use cmSystemTools to report some messages.
These should now be caught and displayed properly,
both in ccmake and cmake-gui

Avoid log display flickering during processing
- Don't clear the screen each time the long message form is rendered.
  It always renders the whole screen again so clearing it only causes
  flickering.
- Add scroll down capabilities to the long message form so that it can
  draw itself directly in the correct state. This removes the need to
  programatically scroll down just after that also caused flickering.

Fixes #19882
Fixes #13288
 2019-11-16 08:27:32 +01:00
Kitware Robot
de1d530ef0 CMake Nightly Date Stamp 2019-11-16 00:01:09 -05:00
Brad King
7d6ab5dc5b CPack: Restore support for custom package configuration templates 
Refactoring in commit 98617f1be0 (Refactor: Move CPack internal files to
`Internal/CPack/` directory, 2019-07-09, v3.16.0-rc1~449^2) accidentally
changed the public-facing names of the templates.  The name passed to
`FindTemplate` is searched in `CMAKE_MODULE_PATH` and should not change.
Remove the `Internal/CPack/` prefix on the names added by that commit.
Teach `FindTemplate` to use our builtin default directly when the
public-facing name is not found in `CMAKE_MODULE_PATH`.

Fixes: #19979
 2019-11-15 10:38:08 -05:00
Kyle Edwards
5695b0464b Merge topic 'cmake-e-rm' 
2d0100fac7 replace remove and remove_directory with rm in tests
5239fc5c75 cmake -E: Add rm with improved semantics over remove and remove_directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3949
 2019-11-15 09:57:56 -05:00
Cristian Adam
bb4c2781ce PCH: Do not issue an error on duplicate target_precompile_headers call 
Fixes: #19970
 2019-11-15 09:47:56 -05:00
Brad King
a4c19cb895 Windows: Restore suppression of error report popups in CI builds 
On Windows, libuv uses `_CrtSetReportHook` to install a handler it uses
to suppress assertions on invalid file descriptors in `_get_osfhandle`.
This removes the handler we install in CI environments to suppress
interactive popups.  Move installation of our handler to after libuv is
initialized so that our handler is actually used.

Unfortunately this also removes libuv's handler and so may cause Debug
builds under CI to abort on invalid file descriptors instead of simply
converting them to `INVALID_HANDLE_VALUE`.  If this becomes a problem
we may need to modify libuv to make its hook more configurable.
 2019-11-15 09:23:47 -05:00
Brad King
0b9f1cc96b Merge branch 'upstream-KWSys' into win-no-error-popup 
* upstream-KWSys:
  KWSys 2019-11-15 (329d8c7c)
 2019-11-15 09:21:08 -05:00
KWSys Upstream
9e27e52d4b KWSys 2019-11-15 (329d8c7c) 
Code extracted from:

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

at commit 329d8c7c907353999827c02a7af341e57aff90aa (master).

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

Brad King (1):
      2581cfd1 SystemTools: Update EnableMSVCDebugHook to simulate "Retry"
 2019-11-15 09:20:46 -05:00
Brad King
1d78e1a966 Merge topic 'cmFileLockPool-remove-dynamic-memory-usage' 
8dd284bf19 cmFileLockPool: enhance items management

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4041
 2019-11-15 09:18:23 -05:00
Brad King
c1ae0532f3 Merge topic 'ctest_test-repeat' 
28994115e8 ctest_test: Add option to REPEAT tests
42d5d8f425 cmCTestMultiProcessHandler: Hold repeat mode as a member
ed65b3e984 CTest: Rename internal APIs for --repeat options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4011
 2019-11-15 09:17:26 -05:00
Brad King
aba3048055 Merge topic 'Fortran-line-continued-use' 
154b8d1a27 Fortran: ignore CPP line directives in line-continued USE stmts
34b7dbbfc3 LexerParser: Regenerate parsers with bison 3.4.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4048
 2019-11-15 09:16:29 -05:00
Brad King
b55f605e70 Merge topic 'update-kwsys' 
dc01c73f2d Merge branch 'upstream-KWSys' into update-kwsys
78ce959a40 KWSys 2019-11-13 (e67ed8ef)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4047
 2019-11-15 09:15:29 -05:00
Brad King
f8a1b07953 Merge topic 'objc-standard-fix' into release-3.16 
6a818b6931 ObjC: Proper initialization of ObjC/XX standard properties

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4050
 2019-11-15 09:06:07 -05:00
Brad King
4f71b55908 Merge branch 'release-3.16' 2019-11-15 09:06:07 -05:00
Brad King
9bc8854b3c Merge topic 'objc-standard-fix' 
6a818b6931 ObjC: Proper initialization of ObjC/XX standard properties

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4050
 2019-11-15 09:06:07 -05:00
Brad King
10f8197400 Merge branch 'release-3.16' 2019-11-15 09:04:41 -05:00
Brad King
330b7b0190 Merge topic 'objc-tests' into release-3.16 
d2e5e6ff1a Tests: Organize Objective C/C++ test directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4051
 2019-11-15 09:04:40 -05:00
Brad King
ee200b7d96 Merge topic 'objc-tests' 
d2e5e6ff1a Tests: Organize Objective C/C++ test directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4051
 2019-11-15 09:04:40 -05:00
Brad King
8a3143bad5 Merge topic 'fix-optional-test' into release-3.16 
e8bd920df1 Tests: Fix reliance on undefined behavior of cm::optional

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4049
 2019-11-15 09:03:17 -05:00
Brad King
18bacbd948 Merge branch 'release-3.16' 2019-11-15 09:03:17 -05:00