mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-08 14:50:10 -06:00
Code Issues Packages Projects Releases Wiki Activity
52,235 Commits 2 Branches 385 Tags
00ecddd9ebcbfc0cc4c2bd4e49ae56db59b465ea
Commit Graph

30414 Commits

Author SHA1 Message Date
Brad King
b6cc9be009 Merge branch 'backport-xcode-framework-quoting' into xcode-framework-quoting 2021-03-10 10:03:36 -05:00
Brad King
4f9a71974e Xcode: Restore support for spaces in framework names 
In commit ce2dee9e5b (Xcode: Don't add framework as -framework argument
in linker info list, 2020-09-28, v3.19.0-rc1~47^2) we split up the path
to a framework into the directory and framework name parts, but only
retained the quoting on the directory part.  Restore quoting of the
framework name.

Fixes: #21910
 2021-03-10 10:01:11 -05:00
Kitware Robot
bef1cc77ef CMake Nightly Date Stamp 2021-03-10 00:01:13 -05:00
Brad King
b5f60c54d0 Merge topic 'update-kwsys' 
4d86c907f3 Merge branch 'upstream-KWSys' into update-kwsys
9e556829c8 KWSys 2021-03-08 (5bfba5e1)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5890
 2021-03-09 09:18:20 -05:00
Brad King
d03732bc65 Merge topic 'soname-spaces' 
7621861f30 Tests: Update LibName to cover spaces in shared library name
388eb83c09 Tests: Enable MAKE_SUPPORTS_SPACES tests with Ninja generators
c0a3317497 Ninja: Escape SONAME on linker command line
9dfa7981d5 Makefiles: Escape SONAME on linker command line

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5880
 2021-03-09 09:17:43 -05:00
Kitware Robot
a8954cc3c4 CMake Nightly Date Stamp 2021-03-09 00:01:16 -05:00
Brad King
4d86c907f3 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-03-08 (5bfba5e1)
 2021-03-08 13:32:35 -05:00
Brad King
b7cd44e482 Merge topic 'vs-flag-table-refactor' 
1b33150f7e cmGlobalVisualStudio10Generator: Generalize flag table lookup interface
414b5e0119 cmGlobalVisualStudio10Generator: Clarify LoadFlagTable argument name
cbba9f26a8 cmGlobalVisualStudio10Generator: Drop unnecessary temporaries
d5522f096d cmGlobalVisualStudio10Generator: Drop default toolset name canonicalization
99f6f1b3b9 cmGlobalVisualStudio10Generator: Remove redundant arguments
1b774e18fb cmGlobalVisualStudio10Generator: Remove redundant arguments
a1c0758ea0 cmGlobalVisualStudio10Generator: Clarify method name
e562e8987c cmGlobalVisualStudio10Generator: Remove unused flag table method argument
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5884
 2021-03-08 13:13:37 -05:00
Kitware Robot
ae791686e7 CMake Nightly Date Stamp 2021-03-08 00:03:15 -05:00
Kitware Robot
b72c7f856d CMake Nightly Date Stamp 2021-03-07 00:01:08 -05:00
Kitware Robot
425ac4c3b3 CMake Nightly Date Stamp 2021-03-06 00:01:19 -05:00
Brad King
1b33150f7e cmGlobalVisualStudio10Generator: Generalize flag table lookup interface 2021-03-05 09:34:59 -05:00
Brad King
414b5e0119 cmGlobalVisualStudio10Generator: Clarify LoadFlagTable argument name 2021-03-05 09:34:59 -05:00
Brad King
cbba9f26a8 cmGlobalVisualStudio10Generator: Drop unnecessary temporaries 2021-03-05 09:34:59 -05:00
Brad King
d5522f096d cmGlobalVisualStudio10Generator: Drop default toolset name canonicalization 
The default toolset names are always canonical.
 2021-03-05 09:34:58 -05:00
Brad King
99f6f1b3b9 cmGlobalVisualStudio10Generator: Remove redundant arguments 2021-03-05 09:34:58 -05:00
Brad King
1b774e18fb cmGlobalVisualStudio10Generator: Remove redundant arguments 2021-03-05 09:34:58 -05:00
Brad King
a1c0758ea0 cmGlobalVisualStudio10Generator: Clarify method name 2021-03-05 09:34:58 -05:00
Brad King
e562e8987c cmGlobalVisualStudio10Generator: Remove unused flag table method argument 2021-03-05 09:34:58 -05:00
Brad King
fe17685722 cmGlobalVisualStudio10Generator: Adopt flag table name methods 
Migrate them from `cmVisualStudio10ToolsetOptions`.
 2021-03-05 09:34:58 -05:00
Brad King
15610d42fe Merge topic 'file-RENAME' 
9bf40d8027 file(RENAME): Add option to not replace existing path
3600c6cd8c cmSystemTools: Add RenameFile option to not replace destination
c61292726c file(RENAME): Add option to capture error message on failure
0c2dc34504 cmSystemTools: Add RenameFile signature to capture the error message
adc351db8f Tests: Add RunCMake helper to run a plain script

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5877
 2021-03-05 08:27:18 -05:00
Brad King
1b2db411ad Merge topic 'cmake-gui-search-case' 
9ec50ff157 cmake-gui: Restore search bar case insensitivity

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5878
 2021-03-05 08:25:29 -05:00
Brad King
c1bbe44dad Merge topic 'cpack-source-dir-symlink' 
c456b09513 CPack: Fix symbolic link detection for directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5879
 2021-03-05 08:22:35 -05:00
Olivier Iffrig
c456b09513 CPack: Fix symbolic link detection for directories 
In the case where the current path is a symlink to a directory, a
trailing slash causes the link to be dereferenced, which means that any
subsequent `FileIsSymlink` on it will return false.

Fixes: #21886
 2021-03-05 08:21:13 -05:00
Kitware Robot
96ee96c6d5 CMake Nightly Date Stamp 2021-03-05 00:01:17 -05:00
Alexander Stein
c0a3317497 Ninja: Escape SONAME on linker command line 
If the shared object name contains spaces, they need to be properly
escaped, or link command will fail.

This was already done for soname symlink creation in commit 13c92b4a30
(Ninja: Fix creation of library symlinks in folders with spaces,
2019-05-20, v3.15.0-rc1~87^2).

Fixes: #20331
 2021-03-04 15:44:49 -05:00
Alexander Stein
9dfa7981d5 Makefiles: Escape SONAME on linker command line 
If the shared object name contains spaces, they need to be properly
escaped, or link command will fail.
 2021-03-04 15:44:48 -05:00
Brad King
9ec50ff157 cmake-gui: Restore search bar case insensitivity 
Since these changes:

* commit f1de6f6682 (cmake-gui: Support building against Qt6,
                     2020-12-17, v3.20.0-rc1~205^2~7)
* commit 134d69121e (cmake-gui: Restore search bar for cache view and
                     environment dialog, 2021-02-22, v3.20.0-rc2~12^2)

the search bar is no longer case insensitive when using Qt 5.12.[0-1],
and possibly some later versions.  It works as of Qt 5.15 though, so
update our version check accordingly.

Fixes: #21884
 2021-03-04 11:25:54 -05:00
Brad King
9bf40d8027 file(RENAME): Add option to not replace existing path 
Add a `NO_REPLACE` option that prevents overwriting `<newname>`
if it exists.
 2021-03-04 08:49:48 -05:00
Brad King
3600c6cd8c cmSystemTools: Add RenameFile option to not replace destination 2021-03-04 08:47:31 -05:00
Brad King
c61292726c file(RENAME): Add option to capture error message on failure 2021-03-04 08:44:06 -05:00
Brad King
0c2dc34504 cmSystemTools: Add RenameFile signature to capture the error message 2021-03-04 08:26:21 -05:00
Kitware Robot
1dde7e350a CMake Nightly Date Stamp 2021-03-04 00:01:19 -05:00
Brad King
12a139f2b6 CMake 3.20.0-rc3 2021-03-03 11:43:22 -05:00
Brad King
a88efbc9cf Merge topic 'cpack-dmg-filesystem' 
e3ac388738 cpack: add CPACK_DMG_FILESYSTEM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5873
 2021-03-03 09:07:29 -05:00
Kitware Robot
f63628b704 CMake Nightly Date Stamp 2021-03-03 00:04:22 -05:00
Kevin Ushey
e3ac388738 cpack: add CPACK_DMG_FILESYSTEM 
Allow users to configure the filesystem format of the generated `.dmg`
via the `CPACK_DMG_FILESYSTEM` option.

Fixes: #21874
 2021-03-02 10:11:15 -05:00
Kitware Robot
e6ca675a29 CMake Nightly Date Stamp 2021-03-02 00:01:16 -05:00
Kitware Robot
653b871cb7 CMake Nightly Date Stamp 2021-03-01 00:01:15 -05:00
Kitware Robot
569547f0c4 CMake Nightly Date Stamp 2021-02-28 00:01:15 -05:00
Kitware Robot
9ff169d1a5 CMake Nightly Date Stamp 2021-02-27 00:01:16 -05:00
Brad King
ea3f09aa40 Merge topic 'include-dir-style' 
3e7dd39747 cmLocalGenerator: Simplify some GetIncludeFlag call sites
a133a583d4 cmLocalGenerator: Clarify GetIncludeFlags signature

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5859
 2021-02-26 08:28:16 -05:00
Brad King
48c6718d88 Merge topic 'c_17_23' 
8211b4706f IntelLLVM: C17 support
b9c3acac02 GNU: C23 support
c9f0613c2a GNU: C17 support
10a72c0f1c Clang: Default C standard doesn't depend on compatibility mode
6c2e309a66 Clang: Set standard flags according to frontend variant
9f81591dbf Clang: MSVC-style C flags
72f4984cdc Clang: C23 support
82239d43f8 Clang: C17 default version
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5783
 2021-02-26 08:26:53 -05:00
Kitware Robot
06bc2d065b CMake Nightly Date Stamp 2021-02-26 00:01:16 -05:00
Brad King
3e7dd39747 cmLocalGenerator: Simplify some GetIncludeFlag call sites 
The path style argument is meaningful only with the Ninja generator,
so drop it from call sites in Makefile and Xcode generators.
 2021-02-25 13:24:54 -05:00
Brad King
a133a583d4 cmLocalGenerator: Clarify GetIncludeFlags signature 
Make the `config` argument non-optional so all callers must be explicit.
Convert the path style argument to an enumeration to make its role clear
at call sites.

The path style argument is implemented by `ConvertToIncludeReference`,
which was introduced with the Ninja generator by commit 5b114c9bee
(Introduce a cmLocalGenerator::ConvertToIncludeReference function,
2011-09-07, v2.8.7~187^2~4).  Its only purpose is to allow the Ninja
generator to use relative paths in `-I` flags.  Add a comment explaining
this role.
 2021-02-25 13:24:45 -05:00
Raul Tambre
dcd599757f C23 support 2021-02-25 18:22:10 +02:00
Raul Tambre
93b7d3d292 C17 support 
Implements #17755.
 2021-02-25 18:22:10 +02:00
Brad King
a5678e46f8 Merge topic 'runtime-dll-deps' 
f31e8d33ef Genex: Fix grammatical error in TARGET_OBJECTS error message
d34d28e688 Genex: Add TARGET_RUNTIME_DLLS genex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5837
 2021-02-25 09:58:40 -05:00
Brad King
c06a6ba61a Merge topic 'create-test-source-list-duplicate-decls' 
136608dfec cmCreateTestSourceList: avoid generating duplicate declarations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5856
 2021-02-25 09:04:20 -05:00