1
0
mirror of https://github.com/Kitware/CMake.git synced 2025-06-24 13:13:18 +08:00

42723 Commits

Author SHA1 Message Date
Sebastian Holtermann
addd1ce402 cmLocalUnixMakefileGenerator3: Move local strings into local brace scopes 2019-03-12 11:01:48 +01:00
Brad King
06a59f1bda Merge topic 'FindSWIG-advanced-exe'
4fe56a67d9 FindSWIG: mark_as_advanced SWIG_EXECUTABLE for cleaner cache display

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3077
2019-03-11 10:15:31 -04:00
Kitware Robot
7a30d72728 CMake Nightly Date Stamp 2019-03-11 00:01:05 -04:00
Kitware Robot
5c106bfc42 CMake Nightly Date Stamp 2019-03-10 00:01:05 -05:00
Kitware Robot
ba3e8f9166 CMake Nightly Date Stamp 2019-03-09 00:01:09 -05:00
Brad King
ec459c10c4 Merge topic 'optimize-properties-processing'
6ae5fffd0f Optimize target properties processing at generation step

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3062
2019-03-08 09:39:43 -05:00
Brad King
42bbde4193 Merge topic 'cmalgorithm-modernize-cmremoveduplicates'
bf1e73305a cmAlgorithms: Refactor cmRemoveDuplicates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3029
2019-03-08 09:38:54 -05:00
Brad King
18ff7cc34f Merge topic 'enable_testing'
538e699e5a Help: for command enable_testing, explain relation to module CTest.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3070
2019-03-08 09:37:56 -05:00
Brad King
8145876a1f Merge topic 'find-pthread-update'
d53317130e FindThreads: Use complete program to test for pthreads in libc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3040
2019-03-08 09:36:35 -05:00
Brad King
9b2665fc2c Merge topic 'win-rel-qt5.12'
adba2945b3 Utilities/Release: Update to Qt 5.12 on Windows builds
58426958ab Utilities/Release: Update for using Windows 10 SDK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3079
2019-03-08 09:35:28 -05:00
Brad King
89215c8ccf Merge branch 'release-3.14' 2019-03-08 09:06:59 -05:00
Brad King
f96f1aa571 CMake 3.14.0-rc4 v3.14.0-rc4 2019-03-08 07:34:57 -05:00
Brad King
93e19df1df Merge branch 'release-3.14' 2019-03-08 07:33:57 -05:00
Brad King
c2a3a945a5 Merge topic 'install-no-imported-global'
47389c5641 install: Do not crash on imported global target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3071
2019-03-08 07:32:48 -05:00
Brad King
b7a861647e Merge topic 'cxx-checks-warning-match'
4ca5a815f2 C++ feature checks: Match warnings more strictly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3075
2019-03-08 07:31:36 -05:00
Brad King
adba2945b3 Utilities/Release: Update to Qt 5.12 on Windows builds 2019-03-08 07:23:55 -05:00
Brad King
58426958ab Utilities/Release: Update for using Windows 10 SDK
In commit e903a9fc55 (Utilities/Release: Create a Windows 64-bit binary,
2016-03-16, v3.6.0-rc1~235^2~2) we added a `_USING_V110_SDK71_` macro to
tell the MSVC standard library headers they were using an older SDK.
The environment in which our Windows binaries are produced has been
updated to use a Windows 10 SDK now that we do not need to support
WinXP, so we can drop the definition.
2019-03-08 07:23:55 -05:00
Sylvain Joubert
4fe56a67d9 FindSWIG: mark_as_advanced SWIG_EXECUTABLE for cleaner cache display 2019-03-08 09:12:51 +01:00
Kitware Robot
b90cab5bff CMake Nightly Date Stamp 2019-03-08 00:01:08 -05:00
Brad King
0e2804b9ba Merge branch 'cxx-checks-warning-match' into release-3.14
Merge-request: !3075
2019-03-07 15:00:26 -05:00
Brad King
4ca5a815f2 C++ feature checks: Match warnings more strictly
Require the word "warning" to appear at the start of a line, after
whitespace, or after a `:`.  This is the same that CTest launchers use
to match warnings.  It avoids matching "warning" inside file paths.

Fixes: #19019
2019-03-07 14:55:54 -05:00
Brad King
8c998e7523 Merge topic 'doc-fix'
d7ca0a2644 Help: add code-block directive

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3074
2019-03-07 14:49:27 -05:00
Kyle Edwards
d7ca0a2644 Help: add code-block directive 2019-03-07 11:52:38 -05:00
Kyle Edwards
e58e38f2fb Merge topic 'more_header_docs'
46c5830394 Help: provide example for HTTPHEADER option to ctest_submit

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3072
2019-03-07 10:52:15 -05:00
Zack Galbreath
46c5830394 Help: provide example for HTTPHEADER option to ctest_submit 2019-03-07 10:08:34 -05:00
Kyle Edwards
2992ba2d02 Merge topic 'feature/cleanup-ctest'
1166aa5ce7 ctest: refactor some code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3064
2019-03-07 09:46:03 -05:00
Marc Chevrier
6ae5fffd0f Optimize target properties processing at generation step
Avoid creating unnecessary `cmCompileGeneratorExpression` instances.
Use runtime polymorphism to avoid the full genex infrastructure when a
property value does not contain a genex.

Issue: #18965
2019-03-07 09:25:43 -05:00
Brad King
c042c998d0 Merge branch 'install-no-imported-global' into release-3.14
Merge-request: !3071
2019-03-07 09:17:21 -05:00
Brad King
3a5ccabd15 Merge branch 'release-3.14' 2019-03-07 09:16:32 -05:00
Brad King
591fab8a6a Merge topic 'vs-explicit-newline'
0bf4418017 VS: Encode newlines in XML attributes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3065
2019-03-07 09:15:57 -05:00
Brad King
47389c5641 install: Do not crash on imported global target
Since commit e89ad0f94e (install: Allow installing targets created in
another directory, 2018-06-18, v3.13.0-rc1~407^2) the `install(TARGETS)`
command may find a global-scoped target outside the calling directory.
Ignore an `IMPORTED GLOBAL` target if it is found in this way.  Imported
targets cannot be installed, and trying to do so violates internal
invariants.

Fixes: #19022
2019-03-07 09:00:56 -05:00
Joachim Wuttke (o)
538e699e5a Help: for command enable_testing, explain relation to module CTest. 2019-03-07 11:58:22 +01:00
Kitware Robot
8f05be9921 CMake Nightly Date Stamp 2019-03-07 00:01:08 -05:00
Brad King
629613ef97 Merge branch 'release-3.14' 2019-03-06 09:44:34 -05:00
Brad King
898d21ebe6 Merge branch 'vs-explicit-newline' into release-3.14
Merge-request: !3065
2019-03-06 09:43:27 -05:00
Luca Cappa
0bf4418017 VS: Encode newlines in XML attributes
Encode `\n` as `&#10;` to avoid generating a literal newline inside an
XML attribute.  This is more readable and also fixes custom commands in
`.csproj` files with VS 2019 RC.

Fixes: #19001
2019-03-06 09:37:21 -05:00
Brad King
4de554b1a5 Merge topic 'docs-xcode-schemes'
d0cb912a28 Help: Remove note that Xcode scheme generator is experimental
de850fe385 Help: Trivial typo fix for CMAKE_XCODE_GENERATE_SCHEME
d61a5a20ef Help: Sort lists of (CMAKE_)XCODE_SCHEME_... variables and properties

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3066
2019-03-06 09:07:59 -05:00
Brad King
ef10c9a199 Merge branch 'docs-xcode-schemes' into release-3.14
Merge-request: !3066
2019-03-06 09:07:29 -05:00
Artur Ryt
bf1e73305a cmAlgorithms: Refactor cmRemoveDuplicates
Use an iterator-based implementation with range-based one simply
deferring to it.

Also optimize a little by storing iterators to unique values to prevent
creating value copies.
2019-03-06 08:57:47 -05:00
Brad King
83183cbaec Merge topic 'vs-no-stamp-messages'
67428e9025 VS: Do not print message when generate.stamp is up-to-date.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3054
2019-03-06 08:37:14 -05:00
Brad King
fb744ed49c Merge topic 'fix-override'
c9d2e1cee0 Fix missing `override`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3061
2019-03-06 08:36:17 -05:00
Brad King
d564d06194 Merge topic 'android-versioned-soname'
64e2c14c4a Android: allow user to enable versioned soname

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3063
2019-03-06 08:33:25 -05:00
Brad King
809890e3f6 Merge topic 'issue-18883-support-for-multiple-targets'
324d18bb34 cmake: Teach --build mode to support multiple targets
ebc94500c1 cmGlobalGenerator: Optimize Printable() method from GeneratedMakeCommand
fdeb364a84 cmGlobalGenerator: Change case of methods from GeneratedMakeCommand struct
b3955a08ab cmakemain: Remove ignored --use-stderr option from command line help
f1367c8c51 cmGlobalGenerator: Remove unused code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2939
2019-03-06 08:32:39 -05:00
Brad King
43771d6e73 Merge branch 'release-3.14' 2019-03-06 08:30:42 -05:00
Brad King
ce9117fdbe Merge topic 'docs-install-destinations'
a5f79b83c7 Help: clarify DESTINATION and TYPE usage for install()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3052
2019-03-06 08:29:14 -05:00
Brad King
3e9ce09a56 Merge topic 'ios-docs'
376138fe0c Help: CMAKE_MACOSX_BUNDLE is ON for iOS/tvOS/watchOS
f7d602b572 Help: Example of tweaking iOS/tvOS/watchOS build
4a9e2e4f35 Help: find_package with fat iOS libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3047
2019-03-06 08:28:13 -05:00
Brad King
742339a779 Merge topic 'ios-variable'
e427c7c1d8 iOS: Add IOS variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3051
2019-03-06 08:27:20 -05:00
Craig Scott
d0cb912a28 Help: Remove note that Xcode scheme generator is experimental 2019-03-07 00:04:55 +11:00
Craig Scott
de850fe385 Help: Trivial typo fix for CMAKE_XCODE_GENERATE_SCHEME 2019-03-07 00:04:55 +11:00
Craig Scott
d61a5a20ef Help: Sort lists of (CMAKE_)XCODE_SCHEME_... variables and properties 2019-03-07 00:04:55 +11:00