summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmake: Reformat '--parallel' and '--verbose' options in helpBartosz Kosiorek2019-03-122-7/+7
|
* CMake Nightly Date StampKitware Robot2019-03-081-1/+1
|
* Merge topic 'doc-fix'Brad King2019-03-071-1/+1
|\ | | | | | | | | | | | | d7ca0a2644 Help: add code-block directive Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3074
| * Help: add code-block directiveKyle Edwards2019-03-071-1/+1
|/
* Merge topic 'more_header_docs'Kyle Edwards2019-03-071-1/+9
|\ | | | | | | | | | | | | 46c5830394 Help: provide example for HTTPHEADER option to ctest_submit Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3072
| * Help: provide example for HTTPHEADER option to ctest_submitZack Galbreath2019-03-071-1/+9
| |
* | Merge topic 'feature/cleanup-ctest'Kyle Edwards2019-03-073-21/+18
|\ \ | |/ |/| | | | | | | | | 1166aa5ce7 ctest: refactor some code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3064
| * ctest: refactor some codeGregor Jasny2019-03-053-21/+18
| |
* | Merge branch 'release-3.14'Brad King2019-03-070-0/+0
|\ \
| * \ Merge branch 'vs-explicit-newline' into release-3.14Brad King2019-03-061-0/+1
| |\ \ | | | | | | | | | | | | Merge-request: !3065
* | \ \ Merge topic 'vs-explicit-newline'Brad King2019-03-071-0/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 0bf4418017 VS: Encode newlines in XML attributes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3065
| * | | VS: Encode newlines in XML attributesLuca Cappa2019-03-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | CMake Nightly Date StampKitware Robot2019-03-071-1/+1
| | | |
* | | | Merge branch 'release-3.14'Brad King2019-03-060-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'docs-xcode-schemes' into release-3.14Brad King2019-03-063-34/+29
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !3066
* | \ \ \ Merge topic 'docs-xcode-schemes'Brad King2019-03-063-34/+29
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Help: Remove note that Xcode scheme generator is experimentalCraig Scott2019-03-061-5/+0
| | | | |
| * | | | Help: Trivial typo fix for CMAKE_XCODE_GENERATE_SCHEMECraig Scott2019-03-061-1/+1
| | | | |
| * | | | Help: Sort lists of (CMAKE_)XCODE_SCHEME_... variables and propertiesCraig Scott2019-03-063-28/+28
| | |/ / | |/| |
* | | | Merge topic 'vs-no-stamp-messages'Brad King2019-03-061-15/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67428e9025 VS: Do not print message when generate.stamp is up-to-date. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3054
| * | | | VS: Do not print message when generate.stamp is up-to-date.Olli Kallioinen2019-03-051-15/+7
| | | | | | | | | | | | | | | | | | | | Fixes: #16783
* | | | | Merge topic 'fix-override'Brad King2019-03-062-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9d2e1cee0 Fix missing `override` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3061
| * | | | | Fix missing `override`Vitaly Stakhovsky2019-03-052-4/+4
| | | | | |
* | | | | | Merge topic 'android-versioned-soname'Brad King2019-03-061-3/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64e2c14c4a Android: allow user to enable versioned soname Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3063
| * | | | | | Android: allow user to enable versioned sonameTom Yan2019-03-051-3/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge topic 'issue-18883-support-for-multiple-targets'Brad King2019-03-0636-382/+432
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | cmake: Teach --build mode to support multiple targetsBartosz Kosiorek2019-03-0536-328/+403
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16136
| * | | | | | cmGlobalGenerator: Optimize Printable() method from GeneratedMakeCommandBartosz Kosiorek2019-03-041-14/+1
| | | | | | |
| * | | | | | cmGlobalGenerator: Change case of methods from GeneratedMakeCommand structBartosz Kosiorek2019-03-048-58/+58
| | | | | | |
| * | | | | | cmakemain: Remove ignored --use-stderr option from command line helpBartosz Kosiorek2019-03-041-1/+0
| | | | | | |
| * | | | | | cmGlobalGenerator: Remove unused codeBartosz Kosiorek2019-03-041-11/+0
| | | | | | |
* | | | | | | Merge branch 'release-3.14'Brad King2019-03-060-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'docs-install-destinations' into release-3.14Brad King2019-03-051-51/+85
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3052
| * \ \ \ \ \ \ Merge branch 'ios-docs' into release-3.14Brad King2019-03-052-1/+62
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3047
| * \ \ \ \ \ \ \ Merge branch 'ios-variable' into release-3.14Brad King2019-03-054-0/+11
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3051
* | \ \ \ \ \ \ \ \ Merge topic 'docs-install-destinations'Brad King2019-03-061-51/+85
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5f79b83c7 Help: clarify DESTINATION and TYPE usage for install() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3052
| * | | | | | | | | Help: clarify DESTINATION and TYPE usage for install()Craig Scott2019-03-051-51/+85
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge topic 'ios-docs'Brad King2019-03-062-1/+62
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Help: CMAKE_MACOSX_BUNDLE is ON for iOS/tvOS/watchOSRuslan Baratov2019-03-051-0/+3
| | | | | | | | |
| * | | | | | | | Help: Example of tweaking iOS/tvOS/watchOS buildRuslan Baratov2019-03-051-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMAKE_OSX_ARCHITECTURES and CMAKE_OSX_DEPLOYMENT_TARGET variables can be used to tweak iOS/tvOS/watchOS build
| * | | | | | | | Help: find_package with fat iOS librariesRuslan Baratov2019-03-051-1/+11
| |/ / / / / / /
* | | | | | | | Merge topic 'ios-variable'Brad King2019-03-064-0/+11
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e427c7c1d8 iOS: Add IOS variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3051
| * | | | | | | iOS: Add IOS variableRuslan Baratov2019-03-054-0/+11
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | CMake Nightly Date StampKitware Robot2019-03-061-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'restore_broken_curses_gui'Brad King2019-03-051-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | ccmake: fix curses dialog broken by refactoringFelix Schwitzer2019-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge topic 'fix_autorcc_for_qt6'Brad King2019-03-052-2/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb97a377dd Autogen: Fallback on internal qrc parser when RCC isn't built yet Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3049
| * | | | | | | Autogen: Fallback on internal qrc parser when RCC isn't built yetAlexandru Croitor2019-03-042-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building a Qt project, the AUTORCC functionality, by default, uses the rcc binary to get the contents of a qrc file for dependency information. This is done at CMake "generate" time. The problem is that while configuring Qt itself, the rcc binary is not built yet. In that case, to get the contents of the qrc file, fall back to the code branch which uses an ifstream instead of the rcc binary.
* | | | | | | | CMake Nightly Date StampKitware Robot2019-03-051-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge topic 'llvm-rc'Brad King2019-03-045-19/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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