Commit Graph

36693 Commits

Author SHA1 Message Date
Sebastian Holtermann
f5ccef1751 Autogen: Extended mocInclude tests
The extended tests cover more AUTOMOC use cases.
2017-07-20 16:55:11 +02:00
Brad King
a8d8d2fd05 Merge topic 'autogen-generated-files'
dca5df16 Autogen: Process GENERATED files. Add CMP0071.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1061
2017-07-20 10:52:20 -04:00
Brad King
e14ad2e376 Merge topic 'vs-lang-std'
131c721f MSVC: Add flags for C++ language standards

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1063
2017-07-20 10:51:12 -04:00
Kitware Robot
f6a85bdbb1 CMake Nightly Date Stamp 2017-07-20 00:01:04 -04:00
Kitware Robot
ce0911011e CMake Nightly Date Stamp 2017-07-19 00:01:08 -04:00
Brad King
b5a28eb9e7 Merge branch 'release-3.9' 2017-07-18 12:41:05 -04:00
Sebastian Holtermann
dca5df16c5 Autogen: Process GENERATED files. Add CMP0071.
This lets AUTOMOC and AUTOUIC process GENERATED files which
used to be ignored before.
A new policy CMP0071 ensures that the old behavior of ignoring
GENERATED files is enabled when the CMake compatibility version
CMAKE_MINIMUM_REQUIRED is < 3.10.

Closes #16186
2017-07-18 18:11:31 +02:00
Brad King
f15cfd891d CMake 3.9.0 2017-07-18 11:18:18 -04:00
Brad King
92856a9d13 Merge branch 'release-3.9' 2017-07-18 11:15:44 -04:00
Brad King
fc4f352513 Merge topic 'server-refactor'
cf0ae55d server: Add support for connections that aren't event based
5ddfb6a4 server: Add connection as part of a request
d4f5d35c server: Refactor to make the event loop owned by server object
5acbf08b Tests: Teach Server test to forward exit code from server process

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !552
2017-07-18 11:14:02 -04:00
Brad King
407c7415f4 Merge topic 'cmake-E-sha'
c4de0a25 Add sha1sum, sha224sum, sha256sum, sha384sum and sha512sum to command mode
c4647d84 Change ComputeFileMD5 to ComputeFileHash
501a4fee Add some unit tests for md5sum

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1021
2017-07-18 11:12:57 -04:00
Brad King
b10d919de7 Merge topic 'GHS_int_detection'
8eb1cb3f GHS: Correct the regex for the intXXXX directory detection.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1062
2017-07-18 11:12:33 -04:00
Brad King
787017451c Merge topic 'objlib-own-target-objs'
d89e10cd Diagnose object library self-reference

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1053
2017-07-18 11:12:00 -04:00
Kitware Robot
ec049641c4 CMake Nightly Date Stamp 2017-07-18 00:01:06 -04:00
Brad King
b97878643b Merge branch 'objlib-own-target-objs' into release-3.9 2017-07-17 11:42:18 -04:00
Brad King
131c721f54 MSVC: Add flags for C++ language standards
Visual Studio 2015 Update 3 introduced the notion of language standard
levels to MSVC.  The language standard level is defined in `_MSVC_LANG`
instead of `__cplusplus`.  It also added support for the `-std:c++14`
and `-std:c++latest` flags, although the compiler defaults to its C++14
mode anyway.  Visual Studio 2017 Update 3 will introduce support for the
`-std:c++17` flag.

Fixes: #16482
2017-07-17 10:48:43 -04:00
Brad King
2e47dee60a Merge branch 'release-3.9' 2017-07-17 10:28:27 -04:00
Brad King
5401491648 Merge topic 'doc-vs2015-update-relnote'
cfa9a2bd Help: Add a 3.9 release note about the VS GenerateDebugInformation update

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1060
2017-07-17 10:27:26 -04:00
Brad King
94d387a970 Merge topic 'TestDriver-fix-Wconversion'
221ffabf TestDriver: Fix -Wconversion warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1058
2017-07-17 10:27:03 -04:00
Brad King
8ff5aeb7cb Merge topic 'xcode9support'
0348383b Xcode: Add "outputPaths" to custom command script build phase

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1054
2017-07-17 10:26:37 -04:00
Brad King
3ce57e3b54 Merge topic 'fix-lang-std-option-list'
cef77f06 Allow language extensions without any standard to use a list of options
74e33711 Merge branch 'backport-fix-lang-std-option-list' into fix-lang-std-option-list
fca05461 cmLocalGenerator: Explain standard flag selection logic in comments
218ce158 Features: Fix support for a list of language standard options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1059
2017-07-17 10:25:36 -04:00
Brad King
9604190701 Merge topic 'FindLibXml2-standard-vars'
a1b38865 FindLibXml2: Switch to standard module variable names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1043
2017-07-17 10:24:54 -04:00
Roman Wüger
8eb1cb3ff1 GHS: Correct the regex for the intXXXX directory detection.
The int directory does not only need to contain digits.
E.g. C:\GHS\int409a is a valid Green Hills installation
2017-07-17 11:30:04 +02:00
Kitware Robot
2d5e494637 CMake Nightly Date Stamp 2017-07-17 00:01:04 -04:00
Kitware Robot
ecfd3ef2f3 CMake Nightly Date Stamp 2017-07-16 00:01:04 -04:00
Kitware Robot
c9433f9b5a CMake Nightly Date Stamp 2017-07-15 00:01:09 -04:00
Brad King
d89e10cd58 Diagnose object library self-reference
The code

    add_library(A OBJECT a.c)
    target_sources(A PRIVATE $<TARGET_OBJECTS:A>)

used to crash CMake via infinite recursion while evaluating the
generator expression.  Then the change in commit v3.9.0-rc1~266^2~1
(cmGeneratorTarget: Replace source classifier implementation,
2017-04-07) avoided the infinite recursion because GetKindedSources now
creates a map entry and initializes it once.  If it is called again on
the same target during that initialization, the partially computed
results are returned.  This is still wrong but does not crash.
Detect and diagnose this case instead.

Co-Author: Ben Boeckel <ben.boeckel@kitware.com>
Fixes: #16578
2017-07-14 14:05:22 -04:00
André Klitzing
c4de0a25ac Add sha1sum, sha224sum, sha256sum, sha384sum and sha512sum to command mode 2017-07-14 19:49:45 +02:00
Vadim Zhukov
a1b3886556 FindLibXml2: Switch to standard module variable names
* LIBXML2_INCLUDE_DIR talks about libxml2 itself;
* LIBXML2_INCLUDE_DIRS lists also include directories coming from
  libxml2's dependencies and is what libxml2 users should use;
* LIBXML2_LIBRARY talks about libxml2 itself;
* LIBXML2_LIBRARIES is what libxml2 users should link to.

This commit doesn't break existing users of FindLibXml2.cmake,
but provides the way for correct behaviour in future. In particular,
on OpenBSD LIBXML2_INCLUDE_DIR resolves to /usr/local/include/libxml2,
while libiconv (an libxml2 dependency) puts iconv.h
in /usr/local/include, which is not picked up automatically.
2017-07-14 11:25:10 -04:00
Brad King
db8b6c69da Merge branch 'release-3.9' 2017-07-14 11:13:18 -04:00
Brad King
f2b05a095a Merge branch 'doc-vs2015-update-relnote' into release-3.9 2017-07-14 11:02:45 -04:00
Brad King
cfa9a2bd88 Help: Add a 3.9 release note about the VS GenerateDebugInformation update
Add a release note corresponding to the environmental regression fixed
by commit v3.9.0-rc6~15^2~1 (VS: Fix GenerateDebugInformation values for
v140 and v141 toolsets, 2017-06-27).
2017-07-14 11:02:17 -04:00
Brad King
68a64478c5 Merge branch 'xcode9support' into release-3.9 2017-07-14 10:40:33 -04:00
Harry Mallon
0348383b8c Xcode: Add "outputPaths" to custom command script build phase
This is needed for Xcode 9's "New Build System", whose release notes
mention "that output must be declared as an explicit output by the
script which generates it" in reference to outputs of custom script
build phases.
2017-07-14 10:38:00 -04:00
Brad King
8c7facd69b Merge branch 'backport-fix-lang-std-option-list' into release-3.9 2017-07-14 10:20:12 -04:00
Brad King
cef77f0687 Allow language extensions without any standard to use a list of options
Fix the logic added by commit a2112257 (Add infrastructure to use
language extensions without any standard, 2017-06-29) to support a list
of options as has been done since commit v3.9.0-rc1~174^2~2
(CompileFeatures: Let STD compile options be a list, 2016-10-05).
2017-07-14 10:20:07 -04:00
Brad King
74e337117f Merge branch 'backport-fix-lang-std-option-list' into fix-lang-std-option-list 2017-07-14 10:19:59 -04:00
Brad King
fca0546175 cmLocalGenerator: Explain standard flag selection logic in comments 2017-07-14 10:19:56 -04:00
Brad King
218ce158f2 Features: Fix support for a list of language standard options
The change in commit v3.9.0-rc1~174^2~2 (CompileFeatures: Let STD
compile options be a list, 2016-10-05) did not change all the places we
add the language standard options.  Expand the list in the other places.
2017-07-14 10:19:44 -04:00
Brad King
0f096b8d73 Merge topic 'cmp0054-asm-warning'
336c4fc6 CMakeDetermineASMCompiler: fix a CMP0054 warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1057
2017-07-14 08:24:31 -04:00
Brad King
688b1c11ec Merge topic 'ninja_cuda_export_compile_commands_support'
712af07e CUDA: CMAKE_EXPORT_COMPILE_COMMANDS now works with CUDA and Ninja

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1055
2017-07-14 08:23:58 -04:00
Brad King
38f81fab72 Merge topic 'vs_csharp_add_custom_command_comment'
21ee3309 VS: print comment in CSharp target only if it is actually set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1049
2017-07-14 08:22:59 -04:00
Brad King
652b2956c8 Merge topic 'CMakePushCheckState-fix-RESET'
fda50a08 CMakePushCheckState: Fix cmake_push_check_state RESET argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1040
2017-07-14 08:22:27 -04:00
Brad King
13e9a370d9 Merge branch 'TestDriver-fix-Wconversion' into release-3.9 2017-07-14 08:01:55 -04:00
Brad King
221ffabfad TestDriver: Fix -Wconversion warning
Since commit v3.8.0-rc1~51^2~1 (TestDriver: calc NumTests at compile
time, 2017-01-24) we convert an expression that uses `sizeof()` to an
`int` as a compile-time constant.  Some GCC versions warn about this
with `-Wconversion`.  Add a cast to avoid the warning.
2017-07-14 08:01:26 -04:00
André Klitzing
c4647d8432 Change ComputeFileMD5 to ComputeFileHash
* Use a parameter to select hash algorithm
* Return a std::string as result or an empty
  string if it fails
* Avoids unnecessary copy of hash value
2017-07-14 08:57:17 +02:00
Kitware Robot
52db8d55e8 CMake Nightly Date Stamp 2017-07-14 00:01:07 -04:00
Ben Boeckel
336c4fc6fa CMakeDetermineASMCompiler: fix a CMP0054 warning
This was introduced in commit d8e6cd9e (IAR: Improve support for IAR ARM
Compiler, 2017-06-15) from !991.

Fixes #17062.
2017-07-13 14:01:38 -04:00
Brad King
9d9085ab36 Merge branch 'ninja_cuda_export_compile_commands_support' into release-3.9 2017-07-13 11:40:08 -04:00
Robert Maynard
712af07e47 CUDA: CMAKE_EXPORT_COMPILE_COMMANDS now works with CUDA and Ninja
Fixes: #17061
2017-07-13 11:23:16 -04:00