mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 04:40:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
43,910 Commits 2 Branches 401 Tags
cecf7e61c4816e4a3bb55df243c6bf84f6df6e58
Commit Graph

43910 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King cecf7e61c4 Merge topic 'BundleUtilities-cleanup' 
8d59ebb704 GetPrerequisites: use CMAKE_OBJDUMP if it is set
e33f4cb0cb BundleUtilities: use if(... IN_LIST ...)
6695383dd5 BundleUtilities: remove needless variable expansions in if() arguments
d5333c0923 BundleUtilities: simplify inclusion of GetPrerequisites

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3447
 2019-06-20 11:43:51 -04:00
Brad King fe11593d30 Merge topic 'update-libuv' 
db4667cc72 libuv: fix compilation with macOS 10.10 SDK
cee57246ef libuv: Add uv__statx() stub to cmake-bootstrap.c
69b139cfca Merge branch 'upstream-libuv' into update-libuv
b4069b04ff libuv 2019-06-10 (ee24ce90)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3457
 2019-06-20 11:42:49 -04:00
Brad King d94d549668 Merge branch 'release-3.15' 2019-06-20 11:42:10 -04:00
Brad King 282fa97a45 Merge topic 'autogen_documentation' 
b55e5d6641 Help: Autogen: Overhaul AUTOMOC target property documentation
fdab21f30b Help: Autogen: Overhaul AUTOUIC target property documentation
d08548c624 Help: Autogen: Overhaul AUTORCC target property documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3461
 2019-06-20 11:27:52 -04:00
Kitware Robot 3e1dac7391 CMake Nightly Date Stamp 2019-06-20 00:01:07 -04:00
Brad King 036752cc0e Merge branch 'autogen_documentation' into release-3.15 
Merge-request: !3461
 2019-06-19 10:43:43 -04:00
Sebastian Holtermann b55e5d6641 Help: Autogen: Overhaul AUTOMOC target property documentation 
- Rewrites and restructures the AUTOMOC target property documentation
- Remove the reference to the deprecated CMAKE_AUTOMOC_RELAXED_MODE

Fixes: #19167
 2019-06-19 10:40:42 -04:00
Sebastian Holtermann fdab21f30b Help: Autogen: Overhaul AUTOUIC target property documentation 2019-06-19 10:40:42 -04:00
Sebastian Holtermann d08548c624 Help: Autogen: Overhaul AUTORCC target property documentation 2019-06-19 10:40:42 -04:00
Brad King 90bd7d0ecf Merge branch 'release-3.15' 2019-06-19 09:46:45 -04:00
Brad King 5c7880956f CMake 3.15.0-rc2 v3.15.0-rc2 2019-06-19 08:33:48 -04:00
Brad King 6425a5f3a0 Merge branch 'release-3.15' 2019-06-19 08:23:31 -04:00
Brad King 08f9355367 Merge branch 'release-3.14' 2019-06-19 08:23:27 -04:00
Brad King 5773f12d84 Merge topic 'android-pie-cmp0083' 
9e99a95c7d Android: ensure PIE behavior is consistent regardless CMP0083 policy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3459
 2019-06-19 08:22:17 -04:00
Brad King 00ad0b9d12 Merge branch 'android-pie-cmp0083' into release-3.15 
Merge-request: !3459
 2019-06-19 08:20:35 -04:00
Brad King c54fc8213b Merge branch 'android-pie-cmp0083' into release-3.14 
Merge-request: !3459
 2019-06-19 08:20:25 -04:00
Marc Chevrier 9e99a95c7d Android: ensure PIE behavior is consistent regardless CMP0083 policy 
In commit c4b4d8b3a6 (POSITION_INDEPENDENT_CODE: Manage link flags for
executables, 2018-10-02, v3.14.0-rc1~395^2) we accidentally removed our
Android-specific logic for PIE under the CMP0083 OLD behavior.  Restore
it and also implement Android-specific logic for CMP0083 NEW behavior.

Fixes: #19393
 2019-06-19 08:12:45 -04:00
Brad King 7ccd9a27df Merge branch 'release-3.15' 2019-06-19 07:27:14 -04:00
Brad King 1ca4be5d90 Merge branch 'FindMPI-imported-link-flags' into release-3.15 
Merge-request: !3449
 2019-06-19 07:26:22 -04:00
Brad King 89e80933d6 Merge topic 'FindMPI-imported-link-flags' 
f7eaa342de FindMPI: Store imported target link flags as a list instead of a string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3449
 2019-06-19 07:26:04 -04:00
Robert Maynard f7eaa342de FindMPI: Store imported target link flags as a list instead of a string 
We already use the `separate_arguments` `NATIVE_COMMAND` mode to parse
command-line strings into lists in several other places.

Fixes: #18897
 2019-06-19 07:25:05 -04:00
Brad King 631fe145e6 Merge topic 'generated_export_remove_duplicate_required_cmake_lines' 
5d8f1a8421 Export: A singular CMake version written for interface targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3458
 2019-06-19 07:23:40 -04:00
Brad King a5d4457083 Merge topic 'FindCUDA-more-libs' 
421be81413 FindCUDA: Add nvToolsExt and OpenCL libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3456
 2019-06-19 07:22:50 -04:00
Brad King a7e34e6952 Merge branch 'release-3.15' 2019-06-19 07:22:18 -04:00
Brad King 7c7c8a01c5 Merge topic 'FindBoost-component' 
830b332f32 FindBoost: Add tests for legacy variables
0dd6772a89 FindBoost: Add legacy variables and targets for compatibility
e4181eeaf2 FindBoost: Don't overwrite Boost_${_comp}_FOUND
4cb652e1d3 Tests.RunCMake.FindBoost: Fix example BoostConfig
7251d54bd1 Tests.FindBoost: Don't use BoostConfig in MODULE test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3438
 2019-06-19 07:21:02 -04:00
Brad King db4667cc72 libuv: fix compilation with macOS 10.10 SDK 
The `F_BARRIERFSYNC` constant was not added until the macOS 10.11 SDK.
Hard-code its value instead.  This approach is backported from upstream
libuv PR 2334.
 2019-06-19 06:57:38 -04:00
Rolf Eike Beer 8d59ebb704 GetPrerequisites: use CMAKE_OBJDUMP if it is set 2019-06-19 07:14:31 +02:00
Rolf Eike Beer e33f4cb0cb BundleUtilities: use if(... IN_LIST ...) 2019-06-19 07:14:25 +02:00
Kitware Robot c9f284c736 CMake Nightly Date Stamp 2019-06-19 00:01:05 -04:00
Eyal Rozenberg 421be81413 FindCUDA: Add nvToolsExt and OpenCL libraries 
Find these libraries with CUDA 5 and above.

Fixes: #19386
 2019-06-18 08:56:34 -04:00
Brad King 65fc109dc6 Merge branch 'FindBoost-component' into release-3.15 
Merge-request: !3438
 2019-06-18 08:37:52 -04:00
Alexander Grund 830b332f32 FindBoost: Add tests for legacy variables 2019-06-18 08:33:36 -04:00
Alexander Grund 0dd6772a89 FindBoost: Add legacy variables and targets for compatibility 
This allows future BoostConfig to NOT define those and users relying on
them use the newer FindBoost of newer CMake versions
 2019-06-18 08:28:38 -04:00
Alexander Grund e4181eeaf2 FindBoost: Don't overwrite Boost_${_comp}_FOUND 
Is set in Boost >= 1.71 so don't overwrite it
 2019-06-18 08:25:14 -04:00
Alexander Grund 4cb652e1d3 Tests.RunCMake.FindBoost: Fix example BoostConfig 2019-06-18 08:24:42 -04:00
Alexander Grund 7251d54bd1 Tests.FindBoost: Don't use BoostConfig in MODULE test 2019-06-18 08:22:50 -04:00
Brad King 0a10422418 Merge topic 'cxx_lambda_init_captures_document_why_not_supported_on_gcc48' 
63bf207cd6 CompileFeatures: document why lambda_init_captures requires GCC 4.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3452
 2019-06-18 07:59:46 -04:00
Brad King 7af2dedc08 Merge topic 'implicit_lapack_library' 
68dcbeee01 FindLAPACK: Test for implicitly linked LAPACK libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3451
 2019-06-18 07:58:48 -04:00
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
Brad King cc7f1be54e Merge branch 'release-3.15' 2019-06-18 07:57:33 -04:00
Brad King a45f061296 Merge topic 'doc-project-include' 
8a08d0c092 Help: Document what project() calls use CMAKE_PROJECT_INCLUDE and friends

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3453
 2019-06-18 07:56:08 -04:00
Brad King e2b4fa1141 Merge branch 'doc-project-include' into release-3.15 
Merge-request: !3453
 2019-06-18 07:56:00 -04:00
Brad King 9c7ea95ab0 Merge topic 'tutorial-fix-version' 
34a7e5ab58 Tests/Tutorial: Fix version displayed in tutorial executable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3448
 2019-06-18 07:54:39 -04:00
Kyle Edwards cee57246ef libuv: Add uv__statx() stub to cmake-bootstrap.c 2019-06-18 07:46:08 -04:00
Brad King 69b139cfca Merge branch 'upstream-libuv' into update-libuv 
* upstream-libuv:
  libuv 2019-06-10 (ee24ce90)
 2019-06-18 07:45:53 -04:00
libuv upstream b4069b04ff libuv 2019-06-10 (ee24ce90) 
Code extracted from:

    https://github.com/libuv/libuv.git

at commit ee24ce900e5714c950b248da2bdd311b01c983be (v1.x).
 2019-06-18 07:45:34 -04:00
Kitware Robot db7fc1e045 CMake Nightly Date Stamp 2019-06-18 00:01:07 -04:00
Robert Maynard 5d8f1a8421 Export: A singular CMake version written for interface targets 2019-06-17 17:38:46 -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
Rolf Eike Beer 6695383dd5 BundleUtilities: remove needless variable expansions in if() arguments 2019-06-17 17:49:31 +02:00