mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-09 10:00:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
42,698 Commits 2 Branches 392 Tags
4fe56a67d9452d7a5b8fb73d3cb311606668c868
Commit Graph

42698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Kitware Robot
28186bd2ba CMake Nightly Date Stamp 2019-03-06 00:01:06 -05:00
Gregor Jasny
1166aa5ce7 ctest: refactor some code 2019-03-05 19:20:29 +01:00
Brad King
ec79045b0e Merge branch 'docs-install-destinations' into release-3.14 
Merge-request: !3052
 2019-03-05 11:26:34 -05:00
Olli Kallioinen
67428e9025 VS: Do not print message when generate.stamp is up-to-date. 
Fixes: #16783
 2019-03-05 11:20:42 -05:00
Tom Yan
64e2c14c4a Android: allow user to enable versioned soname 2019-03-05 23:44:42 +08:00
Brad King
216fff285c Merge branch 'ios-docs' into release-3.14 
Merge-request: !3047
 2019-03-05 09:46:40 -05:00
Ruslan Baratov
376138fe0c Help: CMAKE_MACOSX_BUNDLE is ON for iOS/tvOS/watchOS 2019-03-05 09:45:50 -05:00
Ruslan Baratov
f7d602b572 Help: Example of tweaking iOS/tvOS/watchOS build 
CMAKE_OSX_ARCHITECTURES and CMAKE_OSX_DEPLOYMENT_TARGET variables
can be used to tweak iOS/tvOS/watchOS build
 2019-03-05 09:45:50 -05:00
Ruslan Baratov
4a9e2e4f35 Help: find_package with fat iOS libraries 2019-03-05 09:45:50 -05:00
Brad King
509a9409c3 Merge branch 'ios-variable' into release-3.14 
Merge-request: !3051
 2019-03-05 09:42:58 -05:00
Ruslan Baratov
e427c7c1d8 iOS: Add IOS variable 
Since commit 11da882a12 (Apple: Introduce separate system name for iOS,
tvOS, and watchOS, 2018-01-15, v3.14.0-rc1~14^2~1) we support setting
`CMAKE_SYSTEM_NAME` to `iOS`.  Existing iOS toolchain files already
set `IOS` as a short-hand variable, so do the same here.
 2019-03-05 09:42:41 -05:00
Brad King
451d3907fd Merge topic 'restore_broken_curses_gui' 
aa68ce6bd4 ccmake: fix curses dialog broken by refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Artur Ryt <artur.ryt@gmail.com>
Merge-request: !3055
 2019-03-05 09:04:46 -05:00
Brad King
168c11f70e Merge topic 'fix_autorcc_for_qt6' 
bb97a377dd Autogen: Fallback on internal qrc parser when RCC isn't built yet

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3049
 2019-03-05 09:04:06 -05:00
Bartosz Kosiorek
324d18bb34 cmake: Teach --build mode to support multiple targets 
Fixes: #16136
 2019-03-05 08:55:28 -05:00
Craig Scott
a5f79b83c7 Help: clarify DESTINATION and TYPE usage for install() 2019-03-05 21:48:44 +11:00
Kitware Robot
4b3a739800 CMake Nightly Date Stamp 2019-03-05 00:01:20 -05:00
Vitaly Stakhovsky
c9d2e1cee0 Fix missing override 2019-03-04 19:55:31 -05:00
Felix Schwitzer
aa68ce6bd4 ccmake: fix curses dialog broken by refactoring 
During refactoring in commit f6291eee25 (cmCursesMainForm: Modernize
with STL and ranged-for loops, 2019-02-10) a transformation of a loop
went wrong and editing the cmake cache with ccmake no longer works.
Make ccmake work again.

Fixes: #19008
 2019-03-04 09:12:41 -05:00
Brad King
6873e98486 Merge topic 'llvm-rc' 
e53a968ed5 MSVC: Use -D instead of /D in RC_FLAGS
1a281a1acd RC: Pass output file in a way that llvm-rc 7 and below understand
fa339ced67 CMakeVersion.rc: Avoid preprocessor definitions to support llvm-rc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3007
 2019-03-04 08:42:49 -05:00
Brad King
80898a49d9 Merge branch 'release-3.14' 2019-03-04 08:37:36 -05:00
Brad King
70d204410a Merge topic 'FindPython-NumPy-fix-include-dir' 
8e3358336d FindPython: Fix NumPy component include directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3053
 2019-03-04 08:36:29 -05:00
Brad King
dbd3b1ac90 Merge topic 'vs-fortran-rc' 
0b82f56ac6 VS: Fix Fortran target type selection with RC sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3050
 2019-03-04 08:35:46 -05:00
Brad King
5c0ef417b8 Merge branch 'FindPython-NumPy-fix-include-dir' into release-3.14 
Merge-request: !3053
 2019-03-04 08:28:56 -05:00
Marc Chevrier
8e3358336d FindPython: Fix NumPy component include directory 
Update the component added by commit 513e77550d (FindPython: Introduce
NumPy component, 2018-12-12, v3.14.0-rc1~95^2).  The `numpy/`
sub-directory should not be part of the include directory.  It should be
part of the `#include` line.
 2019-03-04 08:28:21 -05:00