mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-31 11:59:38 -06:00
Code Issues Packages Projects Releases Wiki Activity
43,869 Commits 2 Branches 390 Tags
2454fe84f599abc55fe61eee45d22b45d6d2b7f2
Commit Graph

26776 Commits

Author SHA1 Message Date
Brad King
1b5a7adf5e Merge topic 'library-search-paths' 
2746c61e6d Swift: Add library search paths for dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3436
 2019-06-18 07:57:56 -04:00
Kitware Robot
db7fc1e045 CMake Nightly Date Stamp 2019-06-18 00:01:07 -04:00
Saleem Abdulrasool
2746c61e6d Swift: Add library search paths for dependencies 
When building Swift executables and libraries which import a module, an
implicit link will be added by the driver.  Because this links by name
rather than path, the library search path needs to be provided to
indicate where to find the library.  For all local dependencies, add the
library paths for the targets when linking.  This ensures that you can
link against local libraries without explicitly setting a library path.

Fixes: #19304
 2019-06-17 14:09:15 -04:00
Kyle Edwards
77e59e442d Merge topic 'escape-install-rpath' 
4caefbb423 cmInstallTargetGenerator: Add tests for the RPATH_CHANGE rule
749ce48eb5 cmInstallTargetGenerator: Escape generated OLD_RPATH argument
9e84c7c5e8 cmInstallTargetGenerator: Introduce CMP0095

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3383
 2019-06-17 10:04:47 -04:00
Brad King
2c2c575383 Merge topic 'cmDefinitions_avoid_string_copy' 
563205d6f8 cmDefinitions: Avoid string copy when setting a definition

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3443
 2019-06-17 08:06:46 -04:00
Brad King
805cb43d3e Merge topic 'find_package_prefer_config_fix' 
22e65d10c1 find_package: Fixed CMAKE_FIND_PACKAGE_PREFER_CONFIG Module fallback

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3446
 2019-06-17 07:59:00 -04:00
Brad King
8f8b95395d Merge topic 'capabilities-fileapi' 
d63398d32d fileapi: Suppress lint warning about non-move with old jsoncpp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3442
 2019-06-17 07:54:55 -04:00
Kitware Robot
6903c5bbfb CMake Nightly Date Stamp 2019-06-17 00:01:04 -04:00
Kitware Robot
ddb02c3e0a CMake Nightly Date Stamp 2019-06-16 00:01:05 -04:00
Kitware Robot
6f7b68e7f9 CMake Nightly Date Stamp 2019-06-15 00:01:04 -04:00
Kitware Robot
d229a095a2 CMake Nightly Date Stamp 2019-06-14 00:01:06 -04:00
Cristian Adam
22e65d10c1 find_package: Fixed CMAKE_FIND_PACKAGE_PREFER_CONFIG Module fallback 
Fixes: #19361
 2019-06-13 23:58:30 +02:00
Dennis Klein
749ce48eb5 cmInstallTargetGenerator: Escape generated OLD_RPATH argument 
On some platforms, e.g. most ELF-based ones, RPATHs may contain keywords
that match CMake's variable syntax. To prevent them from being falsely
substituted when running the cmake_install.cmake script CMake syntax
needs to be escaped.
 2019-06-13 16:41:11 +02:00
Dennis Klein
9e84c7c5e8 cmInstallTargetGenerator: Introduce CMP0095 
Escape coincidental CMake syntax in RPATH entries when generating the
intermediary cmake_install.cmake script.

Fixes #19225
 2019-06-13 16:41:04 +02:00
Craig Scott
82629cb377 Merge topic 'cmake-gui-qt-notice' 
c1d6b135ed cmake-gui: Update Qt copyright holder in About dialog

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3441
 2019-06-13 06:55:18 -04:00
Sebastian Holtermann
563205d6f8 cmDefinitions: Avoid string copy when setting a definition 2019-06-13 12:01:08 +02:00
Kitware Robot
d24121d625 CMake Nightly Date Stamp 2019-06-13 00:01:08 -04:00
Brad King
d63398d32d fileapi: Suppress lint warning about non-move with old jsoncpp 2019-06-12 12:51:32 -04:00
Brad King
f07200fe16 Merge topic 'add-test-command-expand-lists' 
e791ffac61 add_test: Add COMMAND_EXPAND_LISTS option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3422
 2019-06-12 12:48:13 -04:00
Brad King
c1580ecc13 Merge topic 'cmPropertyMap_unordered_map' 
00d265e3c8 cmPropertyMap: Use std::unordered_map as container instead of std::map
1b945f95ba cmPropertyMap: Add RemoveProperty method
e0a8ff3148 cmPropertyMap: Use std::string as value container class
8d934d861b cmPropertyMap: Make std::map container private
026f65d284 cmPropertyMap: Add GetList method
9e64e617eb cmPropertyMap: Rename GetPropertyList method to GetKeys

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3435
 2019-06-12 12:46:18 -04:00
Brad King
1af08229a7 Merge topic 'language-dependent-linker-flags' 
a982916304 Support per-language library link flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3429
 2019-06-12 12:45:15 -04:00
Brad King
c1d6b135ed cmake-gui: Update Qt copyright holder in About dialog 
Qt is now copyright "The Qt Company Ltd.".
 2019-06-12 12:39:25 -04:00
Brad King
1492dc8301 Merge topic 'capabilities-fileapi' 
c932f49842 cmake: Teach -E capabilities to report supported fileapi requests
6696855f72 cmake: Simplify implementation of -E capabilities
6b815e58ba fileapi: Factor out helper to construct a version object

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3433
 2019-06-12 11:40:47 -04:00
Kitware Robot
b7d72db89d CMake Nightly Date Stamp 2019-06-12 00:01:08 -04:00
Kyle Edwards
14254e9ea8 Merge topic 'get-runtime-dependencies' 
54ec4c1e79 GetPrerequisites: Add deprecation notice
1f9ef25130 file: Add GET_RUNTIME_DEPENDENCIES mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3335
 2019-06-11 12:03:38 -04:00
Kitware Robot
7c0a542cf1 CMake Nightly Date Stamp 2019-06-11 00:01:05 -04:00
Kyle Edwards
1f9ef25130 file: Add GET_RUNTIME_DEPENDENCIES mode 
Co-Authored-by: Bryon Bean <bryon.bean@kitware.com>
 2019-06-10 14:35:28 -04:00
Kitware Robot
f36719111d CMake Nightly Date Stamp 2019-06-10 00:01:05 -04:00
Kitware Robot
d443b86e58 CMake Nightly Date Stamp 2019-06-09 00:01:05 -04:00
Sebastian Holtermann
00d265e3c8 cmPropertyMap: Use std::unordered_map as container instead of std::map 2019-06-08 12:25:35 +02:00
Sebastian Holtermann
1b945f95ba cmPropertyMap: Add RemoveProperty method 
The new `cmPropertyMap::RemoveProperty` allows to remove a property from the
map.
 2019-06-08 12:25:35 +02:00
Sebastian Holtermann
e0a8ff3148 cmPropertyMap: Use std::string as value container class 2019-06-08 12:25:35 +02:00
Sebastian Holtermann
8d934d861b cmPropertyMap: Make std::map container private 2019-06-08 12:25:35 +02:00
Sebastian Holtermann
026f65d284 cmPropertyMap: Add GetList method 2019-06-08 12:25:35 +02:00
Sebastian Holtermann
9e64e617eb cmPropertyMap: Rename GetPropertyList method to GetKeys 2019-06-08 12:25:35 +02:00
Kitware Robot
0e96fdbc15 CMake Nightly Date Stamp 2019-06-08 00:01:06 -04:00
Sergey Bobrenok
e791ffac61 add_test: Add COMMAND_EXPAND_LISTS option 
Add a `COMMAND_EXPAND_LISTS` option to the `add_test` command to cause
`;`-separated lists produced by generator expressions to be expanded
into multiple arguments.  The `add_custom_command` command already
has such an option.

Fixes: #17284
 2019-06-07 13:14:29 -04:00
Brad King
8be4b173f1 Merge topic 'autogen_header_in_symbolic_path_fix' 
00e6b67e0c Autogen: Fix header detection for paths with symbolic links

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3431
 2019-06-07 11:14:20 -04:00
Brad King
c932f49842 cmake: Teach -E capabilities to report supported fileapi requests 
Fixes: #19339
 2019-06-07 11:08:38 -04:00
Brad King
6696855f72 cmake: Simplify implementation of -E capabilities 
The `cmake -E capabilities` command-line tool is implemented only in a
full-featured (non-bootstrap) CMake, and server mode is now always
available in this case.
 2019-06-07 11:08:38 -04:00
Brad King
6b815e58ba fileapi: Factor out helper to construct a version object 2019-06-07 11:08:38 -04:00
Kitware Robot
e2414ee13d CMake Nightly Date Stamp 2019-06-07 00:01:07 -04:00
Saleem Abdulrasool
a982916304 Support per-language library link flags 
This changes the behaviour of the generators to use a per-language
library search path flag.  This is needed for multi-language projects
with different compilers (e.g. cl + gfortran).  Since the adjusted
variable has been part of the user settings, we control this based on a
policy.

Fixes: #19307
 2019-06-06 15:28:43 -07:00
Sebastian Holtermann
00e6b67e0c Autogen: Fix header detection for paths with symbolic links 
When Autogen searches the header for a source files in a target,
the expanded real path is used and not the (possibly symbolic) original path
of the source file.  If the source file path contains symbolic links, then the
correct `cmSourceFile` instance of the header won't be found, but a new one
will be generated.  This way all header source file properties get lost, which
is problematic especially for the `SKIP_AUTOMOC/UIC/GEN` properties.

This patch changes the header detection in Autogen to use the original source
file path instead of the expanded real source file path.

Fixes: #19346
 2019-06-06 14:14:19 -04:00
Brad King
0b3ba05a9b Merge topic 'cmTarget_cleanups' 
0e4493ec67 cmOutputConverter: Initialize static std::set on construction
f1bdfdf242 cmAddCustomCommand: Initialize static std::unordered_set on construction
8af4b31b8a cmTargetPropertyComputer: Initialize static std::unordered_set on construction
537ea119b9 cmTarget: Initialize static std::unordered_set on construction
c4826787d5 cmTarget: Property initialization cleanup

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3416
 2019-06-06 14:07:23 -04:00
Kitware Robot
9ef92b7d7d CMake Nightly Date Stamp 2019-06-06 00:01:06 -04:00
Kitware Robot
6ca497365a CMake Nightly Date Stamp 2019-06-05 00:01:09 -04:00
Sebastian Holtermann
0e4493ec67 cmOutputConverter: Initialize static std::set on construction 2019-06-04 18:11:19 +02:00
Sebastian Holtermann
f1bdfdf242 cmAddCustomCommand: Initialize static std::unordered_set on construction 2019-06-04 18:11:19 +02:00
Sebastian Holtermann
8af4b31b8a cmTargetPropertyComputer: Initialize static std::unordered_set on construction 2019-06-04 18:11:19 +02:00