Commit Graph

2496 Commits

Author SHA1 Message Date
Brad King
aaf3c5b32c Merge topic 'RemoveKDevelop3'
551bd0b3 Generators: adjust error message for the removed KDevelop3 generator
9198e6a2 Generators: remove KDevelop3 generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1688
2018-01-25 08:34:53 -05:00
Brad King
76f5a87cf1 Merge topic 'sourceFile-new-properties'
04483111 sourceFile properties: add property INCLUDE_DIRECTORIES
3073bd1f VisualStudio generators: refactoring
78b1c2e0 sourceFile properties: add property COMPILE_OPTIONS
3f935e69 LocalGenerator: refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1596
2018-01-25 08:33:35 -05:00
Marc Chevrier
0448311179 sourceFile properties: add property INCLUDE_DIRECTORIES 2018-01-24 15:10:10 +01:00
Brad King
05e9cdb81e Merge topic 'GenerateExportHeader-include-guard'
b1ae9aaf GenerateExportHeader: add release notes, tests for include guard changes
f4082b0e GenerateExportHeader: add INCLUDE_GUARD_NAME option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1643
2018-01-24 08:53:05 -05:00
Brad King
1a9da3c055 Merge topic 'cpack_trace'
93bc5848 CPack: accept --trace and --trace-expand

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1583
2018-01-24 08:52:03 -05:00
Brad King
56fd8b3c72 Merge topic 'UseJava-native-headers-generation'
4829ea23 add_jar: add option GENERATE_NATIVE_HEADERS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1675
2018-01-24 08:51:32 -05:00
Alex Neundorf
9198e6a27b Generators: remove KDevelop3 generator
The last KDevelop3 release was many years ago, in 2008 I think.
I haven't seen or read about anybody using KDevelop 3 since a
long time, so I think it can safely be removed from CMake.
KDevelop 4 (first released in 2010) has its own proper CMake
support now, independent from this generator.

Alex
2018-01-24 08:30:02 -05:00
Isaiah Norton
93bc5848e7 CPack: accept --trace and --trace-expand 2018-01-23 13:15:53 -05:00
Kyle Edwards
b1ae9aaf79 GenerateExportHeader: add release notes, tests for include guard changes 2018-01-23 10:43:40 -05:00
Marc Chevrier
78b1c2e09e sourceFile properties: add property COMPILE_OPTIONS
Add the support of per-source property COMPILE_OPTIONS,
including generator expressions support.

Related: #17507
2018-01-23 10:24:56 +01:00
Marc Chevrier
4829ea239a add_jar: add option GENERATE_NATIVE_HEADERS 2018-01-22 17:15:59 +01:00
Brad King
1f35d3f20a Merge topic 'heading_automoc_macro_names'
c89c87c9 Help: Fix heading level for CMAKE_AUTOMOC_MACRO_NAMES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1671
2018-01-22 10:13:01 -05:00
Brad King
856dc73e02 Merge topic 'docs_cmake_crosscompiling'
60febda4 Help: Explain meaning and limitations of CMAKE_CROSSCOMPILING

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1672
2018-01-22 10:12:21 -05:00
Craig Scott
eae7718440 Merge topic 'docs_cmake_lang_compiler_external_toolchain'
f3e9bedd Help: CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN typo removal

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1679
2018-01-20 17:56:05 -05:00
Craig Scott
f3e9beddfb Help: CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN typo removal 2018-01-20 17:17:28 +11:00
Taylor Braun-Jones
73bb781df0 Help: Reword misleading docs for cmake -E time 2018-01-19 16:07:39 -05:00
Brad King
e68a269cd2 Merge topic 'cache-truncate-newlines'
c42b377c cmCacheManager: Test and document newline truncation behavior
a9c48307 cmCacheManager: Truncate values containing newlines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1652
2018-01-19 10:08:06 -05:00
Craig Scott
c89c87c9be Help: Fix heading level for CMAKE_AUTOMOC_MACRO_NAMES 2018-01-19 08:31:48 +11:00
Craig Scott
60febda455 Help: Explain meaning and limitations of CMAKE_CROSSCOMPILING
Fixes: #17653
2018-01-19 08:31:34 +11:00
Sebastian Holtermann
79908ae4ae Autogen: Add release notes for (CMAKE_)AUTOGEN_PARALLEL 2018-01-17 17:23:49 +01:00
Sebastian Holtermann
45ee4979fb Autogen: Add documentation for (CMAKE_)AUTOGEN_PARALLEL 2018-01-17 17:23:49 +01:00
Brad King
af30899cb4 Merge topic 'fix-documentation'
60216e15 Help: Improved MAIN_DEPENDENCY documentation of add_custom_command()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1665
2018-01-17 10:35:31 -05:00
Brad King
b4dfe1d816 Merge topic 'extend-compile-language-genex'
506fda1c Genex: Enable COMPILE_LANGUAGE for INCLUDE_DIRECTORIES with VS and Xcode
c2f79c98 Genex: Enable COMPILE_LANGUAGE for COMPILE_DEFINITIONS with VS and Xcode
0795d25b cmVisualStudio10TargetGenerator: Factor out include dir computation
1ab4d186 cmLocalVisualStudio7Generator: Clarify variable name of compiled language
07e1a743 cmLocalVisualStudio7Generator: Clarify condition for target that compiles

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1657
2018-01-16 09:33:23 -05:00
Brad King
7accd7ebe2 Merge topic 'CheckIncludeFile-required-libs'
f74c2580 CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1620
2018-01-16 09:27:02 -05:00
Christoph Ruediger
60216e158f Help: Improved MAIN_DEPENDENCY documentation of add_custom_command() 2018-01-16 15:10:26 +01:00
Kyle Edwards
c42b377c29 cmCacheManager: Test and document newline truncation behavior 2018-01-15 09:28:32 -05:00
Brad King
506fda1cf0 Genex: Enable COMPILE_LANGUAGE for INCLUDE_DIRECTORIES with VS and Xcode
The set of compile flags used for a target's C and C++ sources is based
on the linker language.  By default this is always the C++ flags if any
C++ sources appear in the target, and otherwise the C flags.  Therefore
we can define the `COMPILE_LANGUAGE` generator expression in
`INCLUDE_DIRECTORIES` to match the selected language.

This is not exactly the same as for other generators, but is the best VS
and Xcode can do.  It is also sufficient for many use cases since the
set of include directories for C and C++ is frequently similar but may
be distinct from those for other languages like CUDA.

Fixes: #17435
2018-01-12 14:27:37 -05:00
Brad King
c2f79c9867 Genex: Enable COMPILE_LANGUAGE for COMPILE_DEFINITIONS with VS and Xcode
The set of compile flags used for a target's C and C++ sources is based
on the linker language.  By default this is always the C++ flags if any
C++ sources appear in the target, and otherwise the C flags.  Therefore
we can define the `COMPILE_LANGUAGE` generator expression in
`COMPILE_DEFINITIONS` to match the selected language.

This is not exactly the same as for other generators, but is the best VS
and Xcode can do.  It is also sufficient for many use cases since the
set of definitions for C and C++ is frequently similar but may be
distinct from those for other languages like CUDA.

Issue: #17435
2018-01-12 14:27:37 -05:00
Brad King
30fcb92576 Merge topic 'misc-typos'
d91b2d91 MAINT: Misc. typos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1654
2018-01-11 10:18:54 -05:00
Brad King
37a3738b1a Merge topic 'doc-fixes'
da3a329a Linkify target_link_libraries in DEBUG_CONFIGURATIONS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1649
2018-01-11 10:16:01 -05:00
Brad King
45f2872129 Merge topic 'doc-install-arg-order'
f09fda97 Help: improve install() documentation of argument ordering

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1641
2018-01-11 10:15:27 -05:00
Don Hinton
f74c25802d CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES
This is needed when cross compiling and the compiler requires a specific
linker different from the default, e.g., when cross compiling from
Darwin to Linux and passing `-fuse-ld=lld` to clang.

Fixes: #9514
2018-01-10 14:13:32 -05:00
luz.paz
d91b2d9158 MAINT: Misc. typos
Found via `codespell`
2018-01-10 12:34:14 -05:00
Brad King
d08f3f551f Merge topic 'unhardcode-configuration-types'
1f4d7a07 Help: Add references and backticks in LINK_FLAGS prop_tgt
48f7e2d3 Unhardcode the CMAKE_CONFIGURATION_TYPES values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1345
2018-01-10 10:35:04 -05:00
Paul "TBBle" Hampson
da3a329a06 Linkify target_link_libraries in DEBUG_CONFIGURATIONS 2018-01-11 00:00:30 +11:00
Brad King
1906dd3e3d Merge topic 'COMPILE_FLAGS-clarify-sf-prop-documentation'
118815f0 COMPILE_FLAGS: do not imply that the property is a list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1640
2018-01-09 09:36:29 -05:00
Brad King
2cd2dd9cde Merge topic 'doc-CMAKE_SYSTEM_NAME-mode'
edebf6f3 Help: note that CMAKE_SYSTEM_NAME is not set in script mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1639
2018-01-09 09:35:46 -05:00
Brad King
947d6de833 Merge topic 'doc-OUTPUT_NAME-clarify'
6c5d3989 Help: fix documentation for OUTPUT_NAME

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1638
2018-01-09 09:35:19 -05:00
Craig Scott
89d1274630 Merge topic 'improve_generated_property_docs'
11615b29 GENERATED: Improve the documentation of the GENERATED file property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1630
2018-01-09 05:05:41 -05:00
Beren Minor
1f4d7a0715 Help: Add references and backticks in LINK_FLAGS prop_tgt 2018-01-08 21:15:16 +01:00
Beren Minor
48f7e2d300 Unhardcode the CMAKE_CONFIGURATION_TYPES values
This removes duplicated code for per-config variable initialization by
providing a `cmake_initialize_per_config_variable(<PREFIX> <DOCSTRING>)`
function.

This function initializes a `<PREFIX>` cache variable from `<PREFIX>_INIT`
and unless the `CMAKE_NOT_USING_CONFIG_FLAGS` variable is defined, does
the same with `<PREFIX>_<CONFIG>` from `<PREFIX>_<CONFIG>_INIT` for every
`<CONFIG>` in `CMAKE_CONFIGURATION_TYPES` for multi-config generators or
`CMAKE_BUILD_TYPE` for single-config generators.
2018-01-08 21:15:14 +01:00
Kyle Edwards
f09fda97d8 Help: improve install() documentation of argument ordering
Fixes #16362.
2018-01-08 15:07:30 -05:00
Ben Boeckel
118815f095 COMPILE_FLAGS: do not imply that the property is a list
The "added to the list" language hinted that the property was
interpreted as a CMake list, but this is not correct. It is just a
string.
2018-01-08 11:44:18 -05:00
Kyle Edwards
6c5d3989f7 Help: fix documentation for OUTPUT_NAME
Fixes #17177.
2018-01-08 11:33:05 -05:00
Kyle Edwards
edebf6f31a Help: note that CMAKE_SYSTEM_NAME is not set in script mode
Fixes #17109.
2018-01-08 11:04:17 -05:00
Brad King
f4a3143940 Merge topic 'execute_process_UTF8_keyword'
8caec41e execute_process: Allow UTF-8 as a synonym for the UTF8 keyword

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !1623
2018-01-08 10:44:47 -05:00
Brad King
a3bba2a5ad Merge topic '17431-iphone-deployment-target'
4017bf40 Darwin: Emit deployment target that matches the SDK
8f4663ff Xcode: rename embedded SDK query function

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1447
2018-01-08 09:58:11 -05:00
Robert Maynard
11615b297f GENERATED: Improve the documentation of the GENERATED file property 2018-01-08 09:12:33 -05:00
Craig Scott
d88451568d Merge topic 'various-typos'
3ab7bf82 Various typo fixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1626
2018-01-04 14:37:49 -05:00
Luz Paz
3ab7bf8285 Various typo fixes
Some are user-facing. Others are source comments.
2018-01-04 06:52:01 +11:00