mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 21:59:54 -06:00
Code Issues Packages Projects Releases Wiki Activity
48,979 Commits 2 Branches 385 Tags
8a3a1cf71a96f1503eefe3fef45f2665e826fa70
Commit Graph

29137 Commits

Author SHA1 Message Date
Kitware Robot
e9275ad1a1 CMake Nightly Date Stamp 2020-07-08 07:17:31 -04:00
Brad King
6bdbc7dba0 Merge topic 'cmake-gui-qt-5.14' 
8eb7cf9b5f cmake-gui: Fix compilation as C++14 with Qt 5.14

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4978
 2020-07-07 09:17:23 -04:00
Kitware Robot
ce4ed6219a CMake Nightly Date Stamp 2020-07-07 00:02:09 -04:00
Brad King
8eb7cf9b5f cmake-gui: Fix compilation as C++14 with Qt 5.14 
Fix code added by commit d7679f6427 (QCMakeCacheView: use non-deprecated
List and Set constructions, 2020-06-10, v3.18.0-rc2~13^2), used
conditionally on Qt 5.14 or above, to compile as C++14.
 2020-07-06 11:45:03 -04:00
Brad King
a4cfc7d03c Merge topic 'refactor-generator-configs' 
7a969fe21d cmMakefile: Refactor API to better handle empty config values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4957
 2020-07-06 09:28:11 -04:00
Brad King
ab46e71eeb Merge topic 'cmStandardLevelResolver-refactor' 
49f3e0ab6f cmStandardLevelResolver: Refactor to remove duplicate code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4966
 2020-07-06 09:27:19 -04:00
Kitware Robot
c68c744497 CMake Nightly Date Stamp 2020-07-06 00:02:07 -04:00
Kitware Robot
fdd90a4b66 CMake Nightly Date Stamp 2020-07-05 00:02:37 -04:00
Kitware Robot
940857844e CMake Nightly Date Stamp 2020-07-04 00:02:39 -04:00
Robert Maynard
7a969fe21d cmMakefile: Refactor API to better handle empty config values 2020-07-03 07:43:18 -04:00
Robert Maynard
49f3e0ab6f cmStandardLevelResolver: Refactor to remove duplicate code 
This will make it easier to add new languages that have standard flags.
 2020-07-03 07:37:45 -04:00
Brad King
bc27f26fbc Merge topic 'xcode-lang-mm' 
258c8734a9 Xcode: Fix LANGUAGE property on .m/.mm files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4965
 2020-07-03 07:32:06 -04:00
Harry Mallon
258c8734a9 Xcode: Fix LANGUAGE property on .m/.mm files 
When OBJC or OBJCXX is enabled as a language, prefer that for .m and .mm
source file language selection.

Fixes: #20257
 2020-07-03 07:30:50 -04:00
Brad King
977f5ed3d1 Merge topic 'restore-cwd-translation-map' 
85a945a607 Restore handling of build directory inside a symlinked path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4963
 2020-07-03 07:25:31 -04:00
Kitware Robot
bfa645c599 CMake Nightly Date Stamp 2020-07-03 00:03:17 -04:00
Brad King
29d2d4805f Merge topic 'refactor_cmmakefile_language_standards_methods' 
dc94b0249e cmStandardLevelResolver: Added to handle standard level queries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4932
 2020-07-02 08:39:26 -04:00
Brad King
4eb2e50730 Merge topic 'uv-check-return' 
0fddcc1e5b cmake: Tolerate nullptr from uv_default_loop

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4962
 2020-07-02 08:31:31 -04:00
Brad King
85a945a607 Restore handling of build directory inside a symlinked path 
In commit dd8365b3f1 (Merge branch 'upstream-KWSys' into update-kwsys,
2020-04-06, v3.18.0-rc1~397^2) we imported KWSys commit `019afb6ea`
(SystemTools: Drop GetCurrentWorkingDirectory 'collapse' argument,
2020-04-03).  That caused `GetCurrentWorkingDirectory` to no longer send
paths through the KWSys translation map and broke CMake's detection of
the absolute path to a build directory containing a symbolic link.
Add our own `cmSystemTools::GetCurrentWorkingDirectory` wrapper around
the KWSys method in order to restore that mapping.

Test-case-by: Ben Boeckel <ben.boeckel@kitware.com>
Issue: #16228
Fixes: #20900
 2020-07-02 07:33:16 -04:00
Kitware Robot
b028e8c50e CMake Nightly Date Stamp 2020-07-02 00:02:41 -04:00
Brad King
0fddcc1e5b cmake: Tolerate nullptr from uv_default_loop 
`uv_default_loop()` can return `nullptr` when running on a Linux kernel
configured without `CONFIG_EVENTFD`.

Fixes: #20899
 2020-07-01 16:26:44 -04:00
Robert Maynard
dc94b0249e cmStandardLevelResolver: Added to handle standard level queries 
Refactored out of cmMakefile
 2020-07-01 07:58:58 -04:00
Brad King
1e26c84b96 CMake 3.18.0-rc3 2020-07-01 07:14:26 -04:00
Craig Scott
8975c2a55b Merge topic 'remove-warn-unused-vars' 
df6b077625 cmake: Remove broken '--warn-unused-vars' option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4953
 2020-07-01 07:03:54 -04:00
Brad King
b7af2811ae Merge topic 'configure_file-permission-control' 
27b03281e2 configure_file: Add option to control file permissions transfer to copy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4941
 2020-07-01 07:03:03 -04:00
Brad King
0ca6bb8575 Merge topic 'file-ARCHIVE-files-dirs' into release-3.18 
bbcff21f71 file(ARCHIVE*): Collapse FILES and DIRECTORY options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4955
 2020-07-01 07:00:42 -04:00
Brad King
9c3e9881ef Merge topic 'file-ARCHIVE-files-dirs' 
bbcff21f71 file(ARCHIVE*): Collapse FILES and DIRECTORY options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4955
 2020-07-01 07:00:42 -04:00
Kitware Robot
32cfb597f3 CMake Nightly Date Stamp 2020-07-01 00:02:06 -04:00
Rahul Gottipati
27b03281e2 configure_file: Add option to control file permissions transfer to copy 
Issue: #20866
 2020-06-30 11:20:41 -04:00
Brad King
221fd89251 Merge topic 'file-CONFIGURE-subdir' into release-3.18 
e5f5eeca2f file: Fix CONFIGURE output relative path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4951
 2020-06-30 08:04:07 -04:00
Brad King
947a518716 Merge topic 'file-CONFIGURE-subdir' 
e5f5eeca2f file: Fix CONFIGURE output relative path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4951
 2020-06-30 08:04:07 -04:00
Craig Scott
bbcff21f71 file(ARCHIVE*): Collapse FILES and DIRECTORY options 
The two options were concatenated internally for both ARCHIVE_CREATE
and ARCHIVE_EXTRACT. The distinction between files and dirs was not
meaningful. Therefore, replace them with PATHS or PATTERNS 
to more accurately describe the way the options are used.

Fixes: #20884
 2020-06-30 22:01:35 +10:00
Brad King
a939f962d7 Merge topic 'find_library-file-readable' 
f2c903fb9a find_library: Check that library files are readable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4945
 2020-06-30 07:25:54 -04:00
Brad King
e9f667c3b0 Merge topic 'find_library-file-readable' into release-3.18 
f2c903fb9a find_library: Check that library files are readable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4945
 2020-06-30 07:25:53 -04:00
Kitware Robot
4b7b8c2885 CMake Nightly Date Stamp 2020-06-30 00:02:07 -04:00
Brad King
df6b077625 cmake: Remove broken '--warn-unused-vars' option 
This option has been broken since commit b9f9915516 (cmMakefile: Remove
VarUsageStack., 2015-05-17, v3.3.0-rc1~52^2).  That commit removed the
check that an initialized variable has actually been used and caused the
option to warn on every variable ever set.  This was not caught by the
test suite because the test for the feature only checked that warnings
appear when needed and not that they do not appear when not needed.

The option was never very practical to use.  Remove it to avoid the
runtime cost of usage tracking and checks for every variable (which we
were doing even when the option was not used).
 2020-06-29 17:23:27 -04:00
Brad King
e5f5eeca2f file: Fix CONFIGURE output relative path 
In commit a6fee09484 (file: Add CONFIGURE subcommand, 2020-03-06,
v3.18.0-rc1~584^2) we accidentally treated relative path outputs
with respect to the current working directory.  Treat them with
respect to the current binary directory instead.

Fixes: #20885
 2020-06-29 09:20:42 -04:00
Brad King
f2b84d24cf Merge topic 'fileApiAddLanguageStandardBacktrace' 
7d6861f367 fileapi: Extend codemodel targets with language standard
ba835874a4 Add backtrace support for language standard
e43486a639 cmGeneratorTarget: Clarify name of language property lookup helper

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4798
 2020-06-29 08:25:42 -04:00
Brad King
828f85b410 Merge topic 'file-ARCHIVE_CREATE-rename-TYPE-option' 
95159b7dea file(ARCHIVE_CREATE): Rename TYPE option to COMPRESSION
bc45bdc819 Help: Fix contents indenting for file(ARCHIVE_...) subcommands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4948
 2020-06-29 08:23:20 -04:00
Brad King
f2c903fb9a find_library: Check that library files are readable 
Refactoring in commit 6b85166920 (ENH: Refactor find_library search
logic, 2008-09-22, v2.8.0~1665) dropped a call to `FileExists` on the
path under the assumption that the presence of a file in a directory
listing means it exists.  However, dropping that also dropped a check
that verifies the file is readable.  Restore the `FileExists` call to
ensure that we only find readable libraries.
 2020-06-29 07:50:47 -04:00
Kitware Robot
df4d8838ab CMake Nightly Date Stamp 2020-06-29 00:02:06 -04:00
Kitware Robot
4554204956 CMake Nightly Date Stamp 2020-06-28 00:02:36 -04:00
Craig Scott
95159b7dea file(ARCHIVE_CREATE): Rename TYPE option to COMPRESSION 
Fixes: #20883
 2020-06-27 18:38:28 +10:00
Kitware Robot
4041b4da06 CMake Nightly Date Stamp 2020-06-27 00:02:10 -04:00
Kyle Edwards
5fc7c14528 Merge topic 'install-default-directory-permissions' 
d4812a955b cmake-install: implement default directory permissions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4927
 2020-06-26 10:26:57 -04:00
Brad King
ab83a21933 Merge topic 'visual-studio-android' 
6051a49c78 Visual Studio: Add Android support
bbcaf9689e Refactor: Add IsAndroidGuiExecutable() method to cmTarget
14456923bd cmGlobalVisualStudio10Generator: Move variable initialization to header
d5b5c19278 cmGlobalGenerator: FindMakeProgram() before CMakeDetermineSystem

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4898
 2020-06-26 09:35:31 -04:00
Brad King
6e0143f339 Merge topic 'config_genex_support_multiple_types' 
eae15dce6a Genex: $<CONFIG:> now supports multiple configurations
c4cc21d20b cmVisualStudio10TargetGenerator: Do not segfault on empty config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4924
 2020-06-26 09:34:27 -04:00
Justin Goshi
7d6861f367 fileapi: Extend codemodel targets with language standard 2020-06-26 08:52:29 -04:00
Kitware Robot
035a3940f5 CMake Nightly Date Stamp 2020-06-26 05:51:02 -04:00
Asit Dhal
d4812a955b cmake-install: implement default directory permissions 
provide an argument for default directory permissions in cmake --install

Fixes: #20700
 2020-06-25 14:43:30 -04:00
Kitware Robot
aae35feea2 CMake Nightly Date Stamp 2020-06-25 00:02:04 -04:00