mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 12:49:36 -06:00
Code Issues Packages Projects Releases Wiki Activity
40,575 Commits 2 Branches 385 Tags
f9eac2ae4b986f74a97fe16fa19df94331a52b34
Commit Graph

2839 Commits

Author SHA1 Message Date
Brad King
f9eac2ae4b Merge topic 'FindPython-updates' 
329f6aeca5 FindPython*: Windows: add facility to select lookup order for registry.
ffb560adc9 FindPython*: MacOS: Fix erroneous handling of Frameworks.
b0b53921ce FindPython: clean-up lookup names strategy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2369
 2018-09-18 11:15:13 -04:00
Brad King
e7fcd3b8eb Merge topic 'cmake_rule_messages_doc' 
17e581af4c Help: Document CMAKE_RULE_MESSAGES variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2383
 2018-09-17 11:27:29 -04:00
Brad King
7bf9796f3d Merge topic 'docs/gen-see-also' 
e3f9ea8616 docs: add some 'see also' helper texts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2381
 2018-09-17 09:25:03 -04:00
Julien Schueller
17e581af4c Help: Document CMAKE_RULE_MESSAGES variable 
Fixes: #18368
 2018-09-17 10:05:30 +02:00
Brad King
333804fa0e Merge topic 'out-of-dir-linking' 
a1ad0a699b target_link_libraries: Allow use with targets in other directories
9bbae5ae28 cmTarget: Future-proof AddLinkLibrary target lookup scope
f9cb6f618a cmExportFileGenerator: Use cmGeneratorTarget::ResolveTargetReference
18441a6269 cmGeneratorTarget: Factor target name resolution out of link item resolution
2f708f5d65 Make internal TARGET_PROPERTY generator expressions more robust
94a75801c8 Android.mk: De-duplicate link libraries logic during export
8a63b23d16 cmGlobalGenerator: Remove unused FindLocalGenerator method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Patrick Stotko <stotko@cs.uni-bonn.de>
Merge-request: !2370
 2018-09-14 13:25:07 -04:00
Brian Heim
e3f9ea8616 docs: add some 'see also' helper texts 
in cmake-generator-expressions
 2018-09-13 00:32:01 -05:00
Brad King
a1ad0a699b target_link_libraries: Allow use with targets in other directories 
Previously the command did not allow naming targets on the LHS that
were not created in the calling directory.  Lift this restriction to
enable more flexible use by projects.

Targets named on the RHS will need to be looked up during generation in
the scope of the call site rather than the scope of the LHS target.
Introduce an internal syntax in `[INTERFACE_]LINK_LIBRARIES` properties
to specify target names that need to be looked up in a directory other
than that containing the target on which the property is set.  Add
minimal documentation of the syntax to help users that encounter it.

Unfortunately CMake previously did allow such calls in the case that
only `INTERFACE` libraries are specified, but those libraries would be
looked up in the target's directory rather than the caller's.  Add
policy `CMP0079` to enable the new behavior with new lookup scope in a
compatible way.

Fixes: #17943
 2018-09-12 13:06:36 -04:00
Marc Chevrier
329f6aeca5 FindPython*: Windows: add facility to select lookup order for registry. 
Fixes: #18302
 2018-09-12 10:04:05 +02:00
Brad King
9a5b04a5f6 Merge topic 'cmake_cpack_command-doc' 
5ff7149298 Help: Document existence of CMAKE_CPACK_COMMAND

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2367
 2018-09-11 08:30:15 -04:00
Brad King
f13d4b1077 Merge topic 'replace-os-x-name-with-macos' 
ab2e35d614 Replace occurrences of "Mac OS X" with "macOS" in comments
fc1602456a Help: Replace occurrences of "Mac OS X" with "macOS"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Gregor Jasny <gjasny@googlemail.com>
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Merge-request: !2351
 2018-09-11 08:28:05 -04:00
Brad King
e9f72e9c94 Merge topic 'docs/setdirproprs' 
6d8cabe8d4 Help: Clarify INCLUDE_DIRECTORIES directory property behavior
7b9d8ce168 Help: Clarify wording of set_directory_properties docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2337
 2018-09-11 08:26:42 -04:00
Craig Scott
78d165c990 Merge topic 'generator_expressions_typo_fix' 
3914108c4a Help: Formatting typo fix in cmake-generator-expressions(7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2360
 2018-09-11 05:51:03 -04:00
Craig Scott
151fc66827 Merge topic 'cmake-host-system-information-doc-fix' 
228a2b0d82 Help: Clarify cmake_host_system_information memory units

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2339
 2018-09-11 05:48:43 -04:00
Kyle Edwards
5ff7149298 Help: Document existence of CMAKE_CPACK_COMMAND 
This useful variable was previously undocumented. This commit adds
brief documentation for it.
 2018-09-10 12:36:41 -04:00
Brian Heim
6d8cabe8d4 Help: Clarify INCLUDE_DIRECTORIES directory property behavior 
Ordering w.r.t. target creation is important for this property.

Fixes: #17754
 2018-09-10 08:28:44 -04:00
Brian Heim
7b9d8ce168 Help: Clarify wording of set_directory_properties docs 2018-09-10 08:28:30 -04:00
Raul Tambre
3914108c4a Help: Formatting typo fix in cmake-generator-expressions(7) 2018-09-10 15:08:02 +03:00
Taylor Holberton
228a2b0d82 Help: Clarify cmake_host_system_information memory units 
The memory size query implementations report in units of one mebibyte
(2^20).  Clarify the unit in the documentation because "megabyte" might
also be interpreted as 10^6.
 2018-09-10 15:55:07 +08:00
Jason Heeris
68d015fc94 FindSubversion: Add Subversion_WC_INFO option to suppress failures 
Subversion fails when the directory is not actually under its control.
Allow projects to tolerate this case optionally.

Fixes: #18264
 2018-09-07 16:17:28 -04:00
Bartosz Kosiorek
fc1602456a Help: Replace occurrences of "Mac OS X" with "macOS" 
Apple's main Operating system changed their name from OS X to macOS:

    https://www.engadget.com/2016/06/13/os-x-is-now-macos/

Revise documentation accordingly.
 2018-09-05 16:10:49 -04:00
Brad King
69ce062969 Merge topic 'cmakeServerSourcesForInterfaceLibraries' 
d74c2282ea cmake-server: Support codemodel filegroups for INTERFACE_SOURCES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Tobias Hunger <tobias.hunger@gmail.com>
Acked-by: Markus Enzenberger <markus.enzenberger@gmail.com>
Merge-request: !2282
 2018-09-04 09:57:58 -04:00
Brad King
5a02afd920 Merge topic 'vs-winrt-default' 
e78a0c8e8a VS: Add option to tell generator that platfrom is WinRT by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2315
 2018-08-31 14:50:27 -04:00
Craig Scott
16225c28d0 Merge topic 'capture_camke_error-update-docs' 
5fc11b34e4 Help: Add CAPTURE_CMAKE_ERROR to ctest_submit and ctest_update documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2324
 2018-08-31 04:39:27 -04:00
Justin Goshi
d74c2282ea cmake-server: Support codemodel filegroups for INTERFACE_SOURCES 
This change returns information for INTERFACE_SOURCES. We add
a flag to the filegroup to indicate if the target represents
interface sources.

Protocol version is updated to 1.3 since this is a change to what was
released in cmake version 3.12.
 2018-08-30 16:09:22 -07:00
Mikhail Korolev
e78a0c8e8a VS: Add option to tell generator that platfrom is WinRT by default 
Create a ``CMAKE_VS_WINRT_BY_DEFAULT`` variable to indicate this.

Fixes: #18286
 2018-08-30 12:46:57 -04:00
Brad King
b11e021bed Merge topic 'cpack-ext-stage-and-run' 
4a0f664aaf CPackExt: Add CPACK_EXT_ENABLE_STAGING and CPACK_EXT_PACKAGE_SCRIPT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2272
 2018-08-30 09:24:31 -04:00
Brad King
14553ab64b Merge topic 'android-ndk-r18' 
ca97d4cb5f Android: Add support for NDK r18

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2319
 2018-08-30 09:14:32 -04:00
Betsy McPhail
5fc11b34e4 Help: Add CAPTURE_CMAKE_ERROR to ctest_submit and ctest_update documentation 
Also, added CAPTURE_CMAKE_ERROR to vim synax file for ctest_submit,
ctest_update and ctest_memcheck.
 2018-08-28 21:09:53 -04:00
Brad King
ca97d4cb5f Android: Add support for NDK r18 
NDK r18 drops GCC toolchains and some STL types.  We need to choose a
clang toolchain by default when no gcc toolchains are available.  Switch
the STL type default to `c++_static` when the old `gnustl_static`
default is not available.

Update the test suite to not run tests for STL types that do not exist.
Also do not expect the gcc toolchain `cpp` tool to be available because
r18 does not provide it.  Also teach it to tolerate `gcc -dumpmachine`
output like `arm--linux-android` that differs from the toolchain prefix.

Fixes: #18301
 2018-08-28 09:27:26 -04:00
Brad King
ce153cacc7 Merge topic 'static-lib-options' 
974de0e199 static library: add property STATIC_LIBRARY_OPTIONS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2290
 2018-08-27 14:04:22 -04:00
Brad King
07556f1567 Merge topic 'doc-include_directories-alternative' 
e558ada977 Help: Document alternative to include_directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2304
 2018-08-27 14:01:57 -04:00
Brad King
3c1f76b1c4 Merge topic 'doc-clang-tidy-typo' 
85432f4898 Help: Fix typo in clang-tidy example -checks option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2303
 2018-08-24 13:39:42 -04:00
David Demelier
85432f4898 Help: Fix typo in clang-tidy example -checks option 2018-08-24 13:37:24 -04:00
David Demelier
e558ada977 Help: Document alternative to include_directories 
Many existing tutorials suggest `include_directories` but that does
not handle propagation to dependencies and such.  Add a link to its
documentation suggesting `target_include_directories` instead.
 2018-08-23 16:00:02 -04:00
Robert Maynard
1a0f1a25a4 Help: Clarify the unset command 2018-08-21 14:16:32 -04:00
Betsy McPhail
a0916a4692 Help: Add RETURN_VALUE as an option to ctest_submit(CDASH_UPLOAD 2018-08-15 16:29:53 -04:00
Marc Chevrier
974de0e199 static library: add property STATIC_LIBRARY_OPTIONS 
issue: #18251
 2018-08-15 15:20:18 +02:00
Craig Scott
349f8bfb25 Merge topic 'doc-consistently-reference-packagename' 
30d08bdce9 doc: Consistently use <PackageName> for describing the name of a package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2283
 2018-08-15 08:18:49 -04:00
Craig Scott
a6f7a01f3a Merge topic 'better_static_link_flags_docs' 
6b17d85873 Help: Document when LINK_FLAGS and STATIC_LIBRARY_FLAGS are used
9561d42f95 target_link_options: Add test to verify static library behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2274
 2018-08-15 07:58:39 -04:00
Jean-Christophe Fillion-Robin
30d08bdce9 doc: Consistently use <PackageName> for describing the name of a package 2018-08-14 20:54:56 +10:00
Nils Gladitz
4a0f664aaf CPackExt: Add CPACK_EXT_ENABLE_STAGING and CPACK_EXT_PACKAGE_SCRIPT 
CPACK_EXT_ENABLE_STAGING enables optional staging
and CPACK_EXT_PACKAGE_SCRIPT allows to specify an optional
script file that can package staged files via an
external packaging tool.

Issue: #18236
 2018-08-14 08:37:03 +02:00
Robert Maynard
6b17d85873 Help: Document when LINK_FLAGS and STATIC_LIBRARY_FLAGS are used 2018-08-09 12:54:16 -04:00
Brad King
ad4452d1bd Merge topic 'doc-vs-generator-clarify-project-types' 
a82eb539f0 Help: Describe the type of Visual Studio projects that can be generated

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2262
 2018-08-09 11:24:24 -04:00
Jean-Christophe Fillion-Robin
a82eb539f0 Help: Describe the type of Visual Studio projects that can be generated 
Issue: #17956
See-also: https://stackoverflow.com/questions/51647437/use-cmake-to-generate-visual-studio-python-projects/51666488
 2018-08-09 10:58:29 -04:00
Robert Maynard
4d384d290e Help: Document the $CACHE{} syntax 
Also add a test case for the behavior.
 2018-08-07 13:13:27 -04:00
Brad King
d7a1bcd2e6 Merge topic 'xcode_schemes_config' 
6b7f1e1db0 Xcode: Add variables and properties to configure schemes
39c91d0703 cmGlobalGenerator: Add IsXcode query

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1803
 2018-08-06 08:25:50 -04:00
Brad King
be095b3e7f Merge topic 'FindMatlab-mcc' 
f34f6eb3d1 FindMatlab: Add component to find MCC, the Matlab compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2233
 2018-08-06 08:23:14 -04:00
Jean-Christophe Fillion-Robin
79ba596909 Help: Add link to cmake_common.cmake in test process docs 2018-08-05 19:33:28 +10:00
Jason Heeris
f34f6eb3d1 FindMatlab: Add component to find MCC, the Matlab compiler 
Add component `MCC_COMPILER` to request searching for the Matlab
compiler.  Report it in `Matlab_MCC_COMPILER` if it is found.

Issue: #18183
 2018-08-01 09:23:46 -04:00
Gregor Jasny
6b7f1e1db0 Xcode: Add variables and properties to configure schemes 
Add `XCODE_SCHEME_*` target properties and associated variables
`CMAKE_XCODE_SCHEME_*` to initialize them on target creation.
Map each target property value to an associated Xcode scheme entry.

Co-Author: Martin Sander <mail@martin-sander.de>
Fixes: #17919
 2018-08-01 09:12:42 -04:00