Commit Graph

43018 Commits

Author SHA1 Message Date
Brad King
d1c2f8787c Merge topic 'FindPython-handle-virtual-env'
8a2f62cc18 FindPython*: Add capability to control virtual env handling.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3173
2019-04-04 11:28:49 -04:00
Brad King
a63a50c77a Merge topic 'remove_duplicates'
abbb8a7b1d Genex: Add $<REMOVE_DUPLICATES:list>
11338389e5 Help: Fix description in cmake-generator-expressions(7) manual

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3154
2019-04-04 11:27:28 -04:00
Kitware Robot
3d6d7c170c CMake Nightly Date Stamp 2019-04-04 00:01:07 -04:00
Brad King
6fdba8b8be Merge topic 'refactor-lang-flags'
707283981f VS: Use AddLanguageFlags to de-duplicate CMAKE_<LANG>_FLAGS* lookup
8ca1b26286 cmLocalGenerator: Factor IPO logic out of AddLanguageFlags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3177
2019-04-03 14:07:11 -04:00
Brad King
058217669f Merge topic 'find-dependency-fix-17583'
37da6af17d find_dependency: Always search dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3161
2019-04-03 14:05:57 -04:00
Marc Chevrier
8a2f62cc18 FindPython*: Add capability to control virtual env handling.
Fixes: #19097
2019-04-03 09:16:17 +02:00
Kitware Robot
d724060459 CMake Nightly Date Stamp 2019-04-03 00:01:10 -04:00
Brad King
707283981f VS: Use AddLanguageFlags to de-duplicate CMAKE_<LANG>_FLAGS* lookup 2019-04-02 14:23:46 -04:00
Brad King
8ca1b26286 cmLocalGenerator: Factor IPO logic out of AddLanguageFlags
The IPO flag logic was added to `AddLanguageFlags` based on my advice.
However, this method should really only be about `CMAKE_<LANG>_FLAGS*`
variables.  Move the IPO logic out to its call sites.
2019-04-02 14:23:32 -04:00
Brad King
81985b7c6c Merge topic 'nasm-fix'
9e4de543d0 Modules: Check nasm compile object variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3167
2019-04-02 14:17:57 -04:00
Kitware Robot
56ae290284 CMake Nightly Date Stamp 2019-04-02 00:01:09 -04:00
Sebastian Lipponer
abbb8a7b1d Genex: Add $<REMOVE_DUPLICATES:list> 2019-04-01 21:52:17 +02:00
Sebastian Lipponer
11338389e5 Help: Fix description in cmake-generator-expressions(7) manual 2019-04-01 21:50:18 +02:00
Brad King
3e129d71bc Merge topic 'project-include'
7d19b3091d Release note for CMAKE_PROJECT_INCLUDE variable
dda0190458 project: Add variable CMAKE_PROJECT_INCLUDE
390f14a244 Test ProjectInclude: Add NONE to avoid enabling languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3155
2019-04-01 10:49:02 -04:00
Brad King
29802ed272 Merge topic 'refactor-cmcmd'
f13aef4de5 cmcmd: Modernize for loops with cmMakeRange
e9bbfdd9a1 cmcmd: Pass args vector by const&

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3168
2019-04-01 10:47:13 -04:00
Brad King
fa2dbbbdde Merge topic 'utilize-substr'
2d66567dca Modernize: Prefer .substr in place of .c_str() + int

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sebastian Holtermann <sebholt@xwmw.org>
Merge-request: !3169
2019-04-01 10:46:24 -04:00
Brad King
6b5fb23e36 Merge topic 'fix_doxygen_comments'
735c6f39d9 Fix invalid ///! doxygen comment line starts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3170
2019-04-01 10:43:48 -04:00
Brad King
249fb7f71d Merge topic 'cmDepends_tweaks'
87341d8328 cmDepends: Define DependencyMap instead of DependencyVector
5a15c9e7cb cmDepends: Refactor cmDepends::CheckDependencies method
5f6c236481 cmFiletimeCache: Add cmFiletimeCache::Remove method
18c30786a9 cmFileTime: Make cmFileTime::Compare method const

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3156
2019-04-01 10:42:58 -04:00
Brad King
afa2614eea Merge topic 'memorize_c_compilers_with_full_standard_support'
983533a4b8 Record when C compilers have gained full support for 90,99,11
f92ccbc306 CompileFeatures: memoize C compilers with full language level support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3146
2019-04-01 10:41:49 -04:00
Brad King
922480e6f1 Merge topic 'allow_aliasing_unkown_targets'
6d5872a396 add_library: Now support aliasing unknown import targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3148
2019-04-01 10:31:11 -04:00
Craig Scott
c5eb01d4d4 Merge topic 'bug/missed-return-on-cli-errors'
99698ee351 cmake: Fix missed `return` statement when CLI errors found

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3171
2019-04-01 08:57:13 -04:00
Kitware Robot
5ad73b608d CMake Nightly Date Stamp 2019-04-01 00:01:11 -04:00
Alex Turbov
99698ee351 cmake: Fix missed return statement when CLI errors found 2019-04-01 08:31:25 +11:00
Sebastian Holtermann
735c6f39d9 Fix invalid ///! doxygen comment line starts
In various places `///!` was used to start a comment line.  This is not valid
Doygen syntax.  This patch replaces `///!` comment starts with `//!`.
2019-03-31 11:27:12 +02:00
Kitware Robot
11475cc581 CMake Nightly Date Stamp 2019-03-31 00:01:07 -04:00
Artur Ryt
2d66567dca Modernize: Prefer .substr in place of .c_str() + int
A lot of temporary/local strings were created out of C-strings
substr can utilize current string size, so in theory be a little
more efficient.
2019-03-30 16:15:05 +01:00
Artur Ryt
f13aef4de5 cmcmd: Modernize for loops with cmMakeRange
Also minor loop variable renaming
2019-03-30 15:39:45 +01:00
Artur Ryt
e9bbfdd9a1 cmcmd: Pass args vector by const& 2019-03-30 15:34:59 +01:00
Kitware Robot
5bdee37863 CMake Nightly Date Stamp 2019-03-30 00:01:09 -04:00
Connor Davis
9e4de543d0 Modules: Check nasm compile object variable
Check if the CMAKE_ASM_NASM_COMPILE_OBJECT variable is set
before modifying it. Only modify if not previously set.
2019-03-29 21:57:28 -06:00
Damien R
37da6af17d find_dependency: Always search dependencies
When a dependency was already found, find_dependency did not search it
again. While this works in basic case, it does not when there are
components as the check does not take components into account.

Given the fact that there is no documentation about this optimization and
that the correct implementation is not trivial as it would require
changes in find_package to have the list of components already found we
always search dependencies.

Fix #17583.
2019-03-29 22:03:21 +01:00
Ruslan Baratov
7d19b3091d Release note for CMAKE_PROJECT_INCLUDE variable 2019-03-29 18:53:12 +03:00
Brad King
1177464dda Merge branch 'release-3.14' 2019-03-29 11:19:50 -04:00
Brad King
3c9dec0bdc CMake 3.14.1 v3.14.1 2019-03-29 09:22:46 -04:00
Brad King
50a5b7beee Merge branch 'release-3.14' 2019-03-29 09:19:33 -04:00
Brad King
c690e11a56 Merge topic 'implicit-includes'
dad86f1873 ParseImplicitIncludeInfo: Canonicalize implicit include dirs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michel Zou <xantares09@hotmail.com>
Merge-request: !3157
2019-03-29 09:11:41 -04:00
Brad King
5674018cc6 Merge topic 'implicit-includes-autogen'
a8b7cbb787 Autogen: Do not treat hard-coded -I/usr/include exclusion as implicit include

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3159
2019-03-29 09:11:04 -04:00
Brad King
ce0e402934 Merge topic 'ifw_group_option_parsing'
6f6e0966a7 CPackIFW: Add missing cpack_ifw_configure_component_group option processing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3160
2019-03-29 09:10:22 -04:00
Brad King
e2d439a114 Merge topic 'backport-kwsys-SystemTools-copy-self'
ce180cf810 cmake: Fix '-E copy foo .' to avoid clobbering file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3145
2019-03-29 09:09:26 -04:00
Brad King
e532052a0a Merge topic 'update-kwsys'
15be06a5ec Tests: Fix Plugin test for international characters on Windows
24da7da686 Merge branch 'upstream-KWSys' into update-kwsys
8166634958 KWSys 2019-03-28 (e92bdbe8)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3158
2019-03-29 09:08:07 -04:00
Brad King
30159fe751 Merge branch 'implicit-includes' into release-3.14
Merge-request: !3157
2019-03-29 08:49:34 -04:00
Brad King
dad86f1873 ParseImplicitIncludeInfo: Canonicalize implicit include dirs
The implicit include directory extraction added by commit 5990ecb741
(Compute implicit include directories from compiler output, 2018-12-07,
v3.14.0-rc1~108^2) leaves paths like `/usr/lib/../include` unchanged.
Fix the logic to canonicalize such paths (e.g. to `/usr/include`)
as we do for implicit link directories already.  This is important
to ensure the set of implicit directories is represented in the same
form as the include directories that will be compared to them.

Issue: #19095
2019-03-29 08:48:56 -04:00
Brad King
04c0efd4b7 Merge branch 'implicit-includes-autogen' into release-3.14
Merge-request: !3159
2019-03-29 08:48:39 -04:00
Brad King
bd00090e2a Merge branch 'ifw_group_option_parsing' into release-3.14
Merge-request: !3160
2019-03-29 08:48:28 -04:00
Brad King
15be06a5ec Tests: Fix Plugin test for international characters on Windows
Build KWSys with `CP_UTF8` internal encoding so that we can dynamically
load modules by absolute paths that contain international characters.
This is needed now that KWSys DynamicLoader uses KWSys Encoding instead
of hard-coding `CP_UTF8` itself.
2019-03-29 08:19:20 -04:00
Kitware Robot
45ec5a2270 CMake Nightly Date Stamp 2019-03-29 00:01:05 -04:00
Clément Rezvoy
6f6e0966a7 CPackIFW: Add missing cpack_ifw_configure_component_group option processing
Both commit 88ecfd8ba1 (CPackIFW: Add some options, 2016-11-11,
v3.8.0-rc1~248^2) and commit e5089c562c (CPackIFW: Add some options,
2017-01-24, v3.8.0-rc1~53^2) added some options to this macro's
documentation and implementation, but the actual processing of the
parsed options was never added.  Add it now.

Reviewed-by: Konstantin Podsvirov <konstantin@podsvirov.pro>
2019-03-28 14:59:08 -04:00
Sebastian Holtermann
a8b7cbb787 Autogen: Do not treat hard-coded -I/usr/include exclusion as implicit include
The `cmLocalGenerator::GetIncludeDirectoriesImplicit` method is called
by `cmQtAutoGenInitializer` to get the compiler's list of implicit
include directories.  Since commit 557b2d6e65 (Fix regression in
-I/usr/include exclusion logic, 2019-02-13, v3.14.0-rc2~6^2~2) the
method hard-codes exclusion of `/usr/include` for historical reasons.
However, it should not be reported as a real implicit include directory
unless the compiler really has it.

Refactor the logic to distinguish the hard-coded exclusion of
`/usr/include` from the real list of implicit include directories.

Fixes: #19100
2019-03-28 14:07:24 -04:00
Brad King
24da7da686 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2019-03-28 (e92bdbe8)
2019-03-28 11:06:43 -04:00
KWSys Upstream
8166634958 KWSys 2019-03-28 (e92bdbe8)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit e92bdbe8e6eca2a8b6dcf14920e5e25308504206 (master).

Upstream Shortlog
-----------------

Ben Boeckel (7):
      30198dbc DynamicLoader: fix error reporting on Windows
      cf6b5f69 DynamicLoader: use Encoding::ToWindowsExtendedPath for the libname
      d17291ad DynamicLoader: support loading libraries using flags
      40d9e482 DynamicLoader: support loading sibling libraries on Windows
      971809c5 DynamicLoader: test the SearchBesideLibrary flag
      efb006b9 DynamicLoader: include stdio.h for _snprintf
      9e8e9ba0 DynamicLoader: avoid the min/max macros from windows.h

Brad King (1):
      92334e76 SystemTools: CopyFileAlways: avoid copying file over self
2019-03-28 11:06:33 -04:00