mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-01 19:30:13 -06:00
Code Issues Packages Projects Releases Wiki Activity
43,241 Commits 2 Branches 385 Tags
599587feb1685eb75b7efe32cfcc16fed13d65b5
Commit Graph

376 Commits

Author SHA1 Message Date
Brad King
a5932438cd Merge topic 'fix-overlay-icon-windows' 
12ef832c96 cmake-gui: Fix icon overlay on windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3217
 2019-04-12 07:29:20 -04:00
Julien Jomier
12ef832c96 cmake-gui: Fix icon overlay on windows 
Since commit 9175a378f5 (QtDialog: Add windows taskbar progress,
2018-11-17, v3.14.0-rc1~330^2) we've added a missing overlay icon.
This results in Windows falling back to a default overlay icon.
Simply drop this line.

Fixes: #19160
 2019-04-11 14:03:29 -04:00
Brad King
a53c3f03bc Merge branch 'backport-cmake-gui-windows-theme' 2019-04-08 13:30:26 -04:00
mistersandman
fce03306ee cmake-gui: Fix theme on Windows with Qt >= 5.10 
In Qt 5.10 the theme support moved to a separate QWindowsVistaStyle
plugin.

Issue: #19147
 2019-04-08 13:30:05 -04:00
Brad King
dd8c2f3e57 cmake-gui: Drop code not needed with current required CMake version 2019-03-14 11:15:34 -04:00
Vitaly Stakhovsky
950c099d83 cmake: Progress functions use std::string param 2019-02-11 10:32:43 -05:00
Brad King
4b37b4f1bb Merge topic 'modernize-for-loops' 
01b2d6ab74 Modernize: Use ranged for-loops when possible
15bdbec017 cmAlgorithms: Make cmRange advance/retreat safe for rvalues

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
Merge-request: !2901
 2019-02-11 08:08:22 -05:00
Artur Ryt
01b2d6ab74 Modernize: Use ranged for-loops when possible 
Replaced most manual `const_iterator`-based loops and some
reverse-iterator loops with range loops.

Fixes: #18858
 2019-02-07 22:39:05 +01:00
Vitaly Stakhovsky
82edd98300 cmSystemTools: MessageCallback and Message() accept std::string argument 2019-02-07 13:41:27 -05:00
Regina Pfeifer
1180fc8780 OutputCallback: Accept std::string argument 2019-01-30 18:33:58 +01:00
Brad King
c30f9b1cde Merge topic 'functional-callbacks' 
8c92db829b MessageCallback: Remove unused bool& argument
bcee24aecc Use `std::function` for callbacks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: vvs31415 <vstakhovsky@fastmail.com>
Acked-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
Merge-request: !2872
 2019-01-30 08:10:27 -05:00
Brad King
d75fec5a88 Merge topic 'tidy-use-equals-default' 
094f01d0f0 cleanup: Prefer compiler provided special member functions
55671b41d2 clang-tidy: Use `= default`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !2841
 2019-01-29 14:07:24 -05:00
Regina Pfeifer
8c92db829b MessageCallback: Remove unused bool& argument 2019-01-29 16:35:53 +01:00
Regina Pfeifer
bcee24aecc Use std::function for callbacks 2019-01-29 16:32:52 +01:00
Brad King
8e495333c0 Merge topic 'cmake-gui-s-b' 
ad0853b3d4 QtDialog: Clean up and document -S and -B options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2863
 2019-01-28 08:36:58 -05:00
Kyle Edwards
ad0853b3d4 QtDialog: Clean up and document -S and -B options 2019-01-25 16:23:56 -05:00
Lucy Phipps
b9e6d04558 Reduce size of PNG images 
Use FileOptimizer 13.50.2431 (x86) and ZopfliPNG 1.0.2.

Update expected file hashes in tests.
 2019-01-25 09:14:51 -05:00
Regina Pfeifer
55671b41d2 clang-tidy: Use = default 
Suppress some cases in `Source/cmGeneratorExpressionNode.cxx` and
`Source/cmUVHandlePtr.h` where a few older compilers require a
user-defined default constructor (with `{}`).
 2019-01-25 06:44:32 -05:00
Brad King
a7f5cd45e1 Merge topic 'tidy-pass-by-value' 
5a0784ddea clang-tidy: Pass by value

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2836
 2019-01-23 08:17:49 -05:00
Regina Pfeifer
5a0784ddea clang-tidy: Pass by value 2019-01-22 13:03:04 -05:00
Brad King
a1f65014a3 Merge topic 'help-mark-default-generator' 
dfd5ae7da7 Help: Mark default CMake generator with asterisk
6023fe7ff2 ccmake: Append rather than replace Generators section of docs
7408cd3929 cmake: Return generator docs directly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2682
 2019-01-22 11:37:01 -05:00
Julien Jomier
67bced8a26 cmake-gui: Improve label for default platform 
Specify the default platform to be used when the platform field is empty
 2019-01-21 13:18:26 +01:00
Artur Ryt
7408cd3929 cmake: Return generator docs directly 
The GetGeneratorDocumentation() function was not accurately
named and required the vector to populate to be passed as a
function argument. This commit makes the slightly renamed
function return by value, making it a true getter as implied
by its name. Some minor refactoring of the implementation
also makes the steps of populating the vector clearer.
 2019-01-18 12:57:32 -05:00
Julien Jomier
48ec0bc140 cmake-gui: Add field for generator platform selection 
Extend the "first configure" dialog with a field for the user to select
a value for `CMAKE_GENERATOR_PLATFORM`.

Fixes: #17343
 2019-01-18 12:41:35 -05:00
Kyle Edwards
4568d046c4 Properties: Add CMAKE_ROLE global property 
This property allows scripts to determine whether they're in project
mode, script mode, find-package mode, CTest, or CPack.
 2019-01-17 09:44:29 -05:00
Brad King
772edffbf0 Merge topic 'readability-static-accessed-through-instance' 
3e60580784 clang-tidy: Fix readability-static-accessed-through-instance

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2647
 2018-11-28 09:07:45 -05:00
Brad King
cb6229b8b8 clang-tidy: fix warnings in macOS-only code 2018-11-27 13:20:34 -05:00
Brad King
5bc33226b2 Merge topic 'windows-taskbar-progress' 
9175a378f5 QtDialog: Add windows taskbar progress

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2628
 2018-11-26 08:00:36 -05:00
Regina Pfeifer
3e60580784 clang-tidy: Fix readability-static-accessed-through-instance 
Enable the check in .clang-tidy and fix all warnings.
 2018-11-22 00:11:37 +01:00
Julien Jomier
9175a378f5 QtDialog: Add windows taskbar progress 2018-11-20 17:16:08 +01:00
Regina Pfeifer
5731ec30f0 clang-tidy: fix warnings from version 7 
Fix some warnings that are new since clang-tidy version 4, and update
`.clang-tidy` to suppress the rest.
 2018-11-20 10:36:08 -05:00
Brad King
ec9ef691fe Merge topic 'provide_explicit_source_and_build_command_line_options' 
638f00117a Add release note for the -S and -B options.
de962cc00d CMake: Internally uses -S instead of -H to specify source directory
a10d63d578 cmake: -S and -B can be used to specify source and build directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2358
 2018-09-19 10:38:19 -04:00
Robert Maynard
de962cc00d CMake: Internally uses -S instead of -H to specify source directory 2018-09-15 11:25:47 -04:00
Brad King
708b3fecfe Merge topic 'gicv-stdstring' 
13d10ee616 cmState::GetInitializedCacheValue: Return as const std::string*

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2365
 2018-09-12 09:38:37 -04:00
Brad King
f13d4b1077 Merge topic 'replace-os-x-name-with-macos' 
ab2e35d614 Replace occurrences of "Mac OS X" with "macOS" in comments
fc1602456a Help: Replace occurrences of "Mac OS X" with "macOS"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Gregor Jasny <gjasny@googlemail.com>
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Merge-request: !2351
 2018-09-11 08:28:05 -04:00
Vitaly Stakhovsky
13d10ee616 cmState::GetInitializedCacheValue: Return as const std::string* 2018-09-10 09:31:48 -04:00
Bartosz Kosiorek
ab2e35d614 Replace occurrences of "Mac OS X" with "macOS" in comments 
Apple's main Operating system changed their name from OS X to macOS:

    https://www.engadget.com/2016/06/13/os-x-is-now-macos/

Revise source comments accordingly.
 2018-09-10 13:34:09 +02:00
Zeex
13a2751ca6 cmake-gui: Align source and binary directory path text 
Text inputs for "where is the source code" and "where to build the
binaries" had different amount of left spacing, so the two paths were
not aligned. This could create a feeling that you typed something wrong
in the input even though the paths were identical or had a common root
path.
 2018-09-04 13:01:00 -04:00
T.J. Corona
66f59bd7da cmake-gui: Update icons 2018-08-16 11:56:08 -04:00
Kitware Robot
d7204e649e Revise C++ coding style using clang-format-6.0 
Run the `clang-format.bash` script to update all our C and C++ code to a
new style defined by `.clang-format`.  Use `clang-format` version 6.0.

* If you reached this commit for a line in `git blame`, re-run the blame
  operation starting at the parent of this commit to see older history
  for the content.

* See the parent commit for instructions to rebase a change across this
  style transition commit.
 2018-06-01 09:53:42 -04:00
Brad King
45f6aa3235 Windows: Embed version information into cmake-gui 
In commit 5b9da05b7a (Windows: Embed version information into CMake
binaries, 2017-10-25) we accidentally left out cmake-gui.
 2018-01-30 11:51:03 -05:00
Brad King
aaf3c5b32c Merge topic 'RemoveKDevelop3' 
551bd0b3 Generators: adjust error message for the removed KDevelop3 generator
9198e6a2 Generators: remove KDevelop3 generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1688
 2018-01-25 08:34:53 -05:00
Alex Neundorf
9198e6a27b Generators: remove KDevelop3 generator 
The last KDevelop3 release was many years ago, in 2008 I think.
I haven't seen or read about anybody using KDevelop 3 since a
long time, so I think it can safely be removed from CMake.
KDevelop 4 (first released in 2010) has its own proper CMake
support now, independent from this generator.

Alex
 2018-01-24 08:30:02 -05:00
Brad King
98628de812 Extend libuv file translate mode workaround to all executables 
Since libuv commit v1.14.1~7 (win: add uv__once_init() calls,
2017-08-30) the libuv initialization of the file translate mode may take
place even if we do not use a uv loop.  This change was included in our
libuv update commit f4a26c748b (libuv 2018-01-19).  Therefore use of
libuv even through `cmSystemTools::GetRealPath` in any executable may
trigger its file translate mode setting.

Factor out the logic added to `cmake.exe` by commit v3.9.0-rc4~10^2
(cmake: Fix default file translate mode when using libuv, 2017-06-13)
and re-use to initialize all executables.

Issue: #16962
 2018-01-23 09:29:07 -05:00
Luz Paz
3ab7bf8285 Various typo fixes 
Some are user-facing. Others are source comments.
 2018-01-04 06:52:01 +11:00
Brad King
79b241dee0 cmake-gui: Update RegexExplorer for changes to KWSys 2017-12-05 11:32:08 -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
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
Gregor Jasny
96d642c7b8 cmake-gui: Use cmake::Open to open generated project 2017-10-13 21:28:35 +02:00
Brad King
836f42b3c0 Merge topic 'cmake-gui-high-dpi' 
6fb36572 cmake-gui: Enable High DPI scaling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1271
 2017-09-18 10:08:59 -04:00