mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 13:20:47 -06:00
Code Issues Packages Projects Releases Wiki Activity
43,938 Commits 2 Branches 385 Tags
b4a882cf10874fbd04bda81d9dfeeea29dcf3f8b
Commit Graph

43938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
b4a882cf10 Merge topic 'FindPython-FIND_ABI' 
9201908ca5 FindPython: add Python_FIND_ABI hint.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3463
 2019-06-25 07:06:35 -04:00
Brad King
2e8b8eb857 Merge topic 'help-guide-tutorial' 
8ab8563533 Help: Add tutorial guide table of contents
0a6c9c417a Help: Update tutorial to include text from CMake book
eef3e020c2 Help: Populate tutorial guide text
862cfc0e6c Help/guide/tutorial: Adopt tutorial code
d2fde94809 Help: Add infrastructure for guide-level documentation
f067af8e38 Tests/Tutorial: Remove trailing blank lines
d5a81ef747 Tests/Tutorial: Remove unused file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3439
 2019-06-25 07:05:35 -04:00
Kitware Robot
edf232dbe4 CMake Nightly Date Stamp 2019-06-25 00:01:07 -04:00
Brad King
5835f553be Merge branch 'release-3.15' 2019-06-24 09:44:46 -04:00
Brad King
154d25f5ba Merge branch 'doc-typos-cmake_parse_arguments' into release-3.15 
Merge-request: !3468
 2019-06-24 09:44:07 -04:00
Brad King
394adf63c6 Merge topic 'doc-typos-cmake_parse_arguments' 
264612c013 Help: Typo and grammar fixes in cmake_parse_arguments() docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !3468
 2019-06-24 09:43:50 -04:00
Brad King
e8fe1d34f8 Merge branch 'release-3.15' 2019-06-24 08:28:13 -04:00
Brad King
2225c8a1dd Merge topic 'doc-IMPORTED_LOCATION' 
96c6bc2584 Help: Improve documentation of IMPORTED_LOCATION property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !3466
 2019-06-24 08:26:46 -04:00
Brad King
1ba0cd2967 Merge topic 'vs-ce-deploy' 
7035bdeb52 VS10Generator: add project properties to enable WindowsCE deployment.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3462
 2019-06-24 08:25:41 -04:00
Marc Chevrier
9201908ca5 FindPython: add Python_FIND_ABI hint. 
This variable will enable to specify will ABIs will be searched.
 2019-06-24 12:00:21 +02:00
Kitware Robot
a639464691 CMake Nightly Date Stamp 2019-06-24 00:01:05 -04:00
Craig Scott
264612c013 Help: Typo and grammar fixes in cmake_parse_arguments() docs 2019-06-23 21:10:16 +10:00
Kitware Robot
0ecf3ef9e8 CMake Nightly Date Stamp 2019-06-23 00:01:06 -04:00
Kitware Robot
f2bce265b7 CMake Nightly Date Stamp 2019-06-22 00:01:08 -04:00
Brad King
7dbd21fcf4 Merge branch 'doc-IMPORTED_LOCATION' into release-3.15 
Merge-request: !3466
 2019-06-21 12:00:44 -04:00
Alexandru Croitor
96c6bc2584 Help: Improve documentation of IMPORTED_LOCATION property 
Mention the usage of a configuration specific
`IMPORTED_LOCATION_<CONFIG>` value even if the `<CONFIG>` is not the
same as the active configuration of the currently built project.

Co-Author: Brad King <brad.king@kitware.com>
 2019-06-21 11:59:38 -04:00
Brad King
12c65a52bd Merge topic 'find-control-vars' 
02f527c66a Find: Provide global controls for the `NO_[]_PATH` call options
f0a89149bc RunCMake: Automatically support platform out override files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3444
 2019-06-21 11:07:56 -04:00
Robert Maynard
02f527c66a Find: Provide global controls for the NO_[]_PATH call options 2019-06-21 11:06:39 -04:00
Robert Maynard
f0a89149bc RunCMake: Automatically support platform out override files 2019-06-21 11:06:39 -04:00
Kitware Robot
512013e276 CMake Nightly Date Stamp 2019-06-21 00:01:07 -04:00
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
Wil Stark
7035bdeb52 VS10Generator: add project properties to enable WindowsCE deployment. 
Fixes: #19408
 2019-06-19 15:11:57 -07: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
8ab8563533 Help: Add tutorial guide table of contents 2019-06-19 09:00:19 -04:00
Betsy McPhail
0a6c9c417a Help: Update tutorial to include text from CMake book 2019-06-19 08:59:31 -04:00
Betsy McPhail
eef3e020c2 Help: Populate tutorial guide text 
Migrate tutorial text from individual `directions.txt` files to the main
tutorial document.  Add some comments to source code to provide anchors
for inclusion.
 2019-06-19 08:57:12 -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