Commit Graph
28539 Commits
Author SHA1 Message Date
Brad King 970569a941 Merge topic 'vs-2017-choose-via-environment'
2644e4c9 VS: Choose VS 2017 instance via environment variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1030
2017-07-11 07:37:42 -04:00
Brad King a49b235db9 Merge topic 'autogen_skip_included'
ecac50e1 Autogen: Skip included files on demand

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1039
2017-07-11 07:35:56 -04:00
Kitware Robot e1476f9618 CMake Nightly Date Stamp 2017-07-11 00:01:08 -04:00
Justin Berger cf0ae55dcb server: Add support for connections that aren't event based 2017-07-10 18:12:05 -06:00
Justin Berger 5ddfb6a472 server: Add connection as part of a request 2017-07-10 18:11:33 -06:00
Justin Berger d4f5d35ca4 server: Refactor to make the event loop owned by server object 2017-07-10 18:11:27 -06:00
Betsy McPhail 47b3a57c9b Display subproject timing summary
Use the '--no-subproject-summary' option to disable timing summary.
2017-07-10 16:25:18 -04:00
Betsy McPhail d385962419 Add directory property 'LABELS' and CMAKE_DIRECTORY_LABELS variable
The specified LABELS will be passed down to subdirectories as well as
any targets or tests in the directory.
2017-07-10 16:25:18 -04:00
Betsy McPhail d08ec4d25a Add CTEST_LABELS_FOR_SUBPROJECTS as a CTest module and script variable
Use this variable to specify a list of labels that will be reported to
CDash as subprojects.
2017-07-10 16:25:18 -04:00
Brad King 6fba4ec0f5 Merge branch 'bindexplib-revert-consts' into release-3.9 2017-07-10 14:54:30 -04:00
Brad King 3250b9a122 bindexplib: Revert support for constants symbols
Revert the main logic change of commit v3.9.0-rc1~192^2 (bindexplib: fix
constants symbols export, 2017-04-26) and its test case.  Unfortunately
some constants may be provided by multiple object files with different
`@...` suffixes, leading to ambiguous references.  Revert support
pending further investigation.

Fixes: #17045
2017-07-10 14:54:07 -04:00
UfoXp 2c82d9c81f Add more extensions to Resources source group by default
Extend the Resources group regex to match pdf, png, jpeg, jpg,
storyboards, and xcassets.  This cleans up more complex Xcode projects a
lot.

While at it, factor the regular expressions for both "Resources" and
"Source Files" into macros.
2017-07-10 11:33:56 -04:00
Brad King dd69dea3e7 Merge branch 'vs-2017-choose-via-environment' into release-3.9 2017-07-10 11:08:27 -04:00
Brad King 2644e4c9fc VS: Choose VS 2017 instance via environment variable
In the `Visual Studio 15 2017` generator, if the `VS150COMNTOOLS`
environment variable points at a specific VS 2017 instance reported by
the Visual Studio Installer tool, use that as the preferred instance.

Inspired-by: Iyyappa Murugandi <iyyappam@microsoft.com>
Fixes: #16846
2017-07-10 11:08:11 -04:00
Brad King f7f721d40a Merge branch 'autogen_skip_included' into release-3.9 2017-07-10 10:26:32 -04:00
Brad King 41be8a739e Merge topic 'autogen-no-generated-files'
9a34e95a Autogen: Skip generated files for compatibility with CMake 3.8

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1033
2017-07-10 10:22:00 -04:00
Brad King 4bf96ed9b0 Merge topic 'find_package-restore-considered-configs'
e7730d78 find_package: Restore longer message when config files were considered

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1032
2017-07-10 10:21:23 -04:00
Brad King 9eaf0fea28 Merge topic 'indented_cmakedefine'
58f47448 configure_file: Add support for indented cmakedefine

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1024
2017-07-10 10:21:00 -04:00
Sebastian Holtermann ecac50e133 Autogen: Skip included files on demand 2017-07-10 13:36:48 +02:00
Yurii Batrak 4ef0eedb49 Ninja: always use response file for cmake_ninja_dyndep
Command line argument passed to the internal tool "cmake_ninja_dyndep"
could hit MAX_ARG_STRLEN on Linux for projects with a large code base.
To prevent such problems, a response file was opted for argument transfer
in all cases, not only on Windows.
2017-07-10 13:08:18 +02:00
Kitware Robot fc58819150 CMake Nightly Date Stamp 2017-07-10 00:01:09 -04:00
Kitware Robot e09252f5d2 CMake Nightly Date Stamp 2017-07-09 00:01:09 -04:00
Kitware Robot 0ba4a4c36f CMake Nightly Date Stamp 2017-07-08 00:01:05 -04:00
Iyyappa Murugandi efaf987ad1 cmFileLockResult: Avoid allocation for Windows error message 2017-07-07 14:04:20 -04:00
Brad King 9b9a57e16b Merge branch 'autogen-no-generated-files' into release-3.9 2017-07-07 11:44:35 -04:00
Brad King 916b7d5195 Merge branch 'find_package-restore-considered-configs' into release-3.9 2017-07-07 11:44:29 -04:00
Brad King e7730d78b4 find_package: Restore longer message when config files were considered
Since commit v3.9.0-rc1~58^2 (find_package: shorten output for missing
package in config mode, 2017-05-09) we print only the one line

    - Could NOT find Foo (missing: Foo_DIR)

when package Foo cannot be found in CONFIG mode and it is not REQUIRED.
However, in the case that package configuration files were found but not
used, this one line message leaves out important information.  This can
happen when a package configuration file sets `Foo_FOUND` to `FALSE` or
when its package version file does not match the requested version.
Restore the longer message in these cases.  Otherwise a seemingly valid
explicit `Foo_DIR` setting appears to be silently ignored even if it was
considered.

Fixes: #17029
2017-07-07 11:43:59 -04:00
Brad King 9a34e95a41 Autogen: Skip generated files for compatibility with CMake 3.8
The change in commit v3.9.0-rc1~464^2~8 (Autogen: Add AUTOMOC/UIC
support for generated source files, 2017-03-02) changes behavior of
existing projects that may not expect `AUTOGEN` on generated files and
do not yet set `SKIP_AUTOGEN` on them.  Disable the behavior change for
now to fix the regression for CMake 3.9.  We can restore it later with a
policy.

In order to keep the implementation and tests working, add an
undocumented property we can use in the tests to enable the behavior
before the policy is introduced.

Fixes: #17031
Issue: #16186
2017-07-07 10:12:15 -04:00
Brad King 364496e4d2 Merge topic 'add-missing-fallthrough'
6c80e958 cmCTest: Add missing switch case fallthrough markup

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1027
2017-07-07 08:42:41 -04:00
Brad King 1ff7cd1fe7 Merge topic 'iar_improved'
d8e6cd9e IAR: Improve support for IAR ARM Compiler
0b1a2876 Add a CMAKE_<LANG>_COMPILER_ARCHITECTURE_ID variable
fea7d69d Store CMAKE_ASM_COMPILER_VERSION persistently
d2a8b5ce CMakeDetermineASMCompiler: Fix small copy-paste mistake
a2112257 Add infrastructure to use language extensions without any standard
8cd28bb0 cmLocalGenerator: Switch order of <LANG>_{EXTENSIONS,STANDARD} check
0fc2d78e cmLocalGenerator: Simplify logic for language standard or extension flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !991
2017-07-07 08:42:22 -04:00
Brad King d2617a28eb Merge topic 'connect_disablePCH_with_cl_option'
d1713d8b VS: connect /Y- compiler option with "Not Using Precompiled Headers"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1026
2017-07-07 08:41:30 -04:00
Kitware Robot 17115f0a5b CMake Nightly Date Stamp 2017-07-07 00:01:07 -04:00
Ivan Shcherbakov 4db3227514 server: Rename cmServerProtocol1_0 to cmServerProtocol1
It will serve additional minor versions.

Suggested-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-06 11:03:14 -04:00
Brad King 3572548eb3 Merge topic 'autogen_p'
251bcbed Autogen: Continue search for FOO_p.h when FOO.h was found

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1022
2017-07-06 10:13:25 -04:00
Kitware Robot 8bc93cdd79 CMake Nightly Date Stamp 2017-07-06 00:01:05 -04:00
Brad King 6c80e958ca cmCTest: Add missing switch case fallthrough markup
Without this, GCC 7 warns.

Reported-by: Rolf Eike Beer <eike@sf-mail.de>
2017-07-05 11:48:47 -04:00
Brad King cf9a994d9a Merge branch 'autogen_p' into release-3.9 2017-07-05 10:29:27 -04:00
Brad King f973d49ab9 Merge topic 'vs-link-guard-cf'
82a5c2c6 VS: Fix support for '/guard:cf' linker flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1018
2017-07-05 10:11:21 -04:00
Brad King a57b353750 Merge topic 'autogen-header-skip'
83d8acee Autogen: Check .moc header name against SKIP list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1017
2017-07-05 10:11:00 -04:00
Brad King ef31812ede Merge branch 'autogen-header-skip' into release-3.9 2017-07-05 09:42:15 -04:00
Olender, Sebastian D d1713d8bc5 VS: connect /Y- compiler option with "Not Using Precompiled Headers"
The change allows to selectively disable PrecompiledHeaders.
Despite the `$(VCTargetsPath)/1033/cl.xml` contains an empty value for switch,
for effectively turn off setting need to use /Y- option as described on msdn:
https://msdn.microsoft.com/en-us/library/1hy7a92h.aspx
2017-07-05 10:58:04 +02:00
Kitware Robot cdb43f1c88 CMake Nightly Date Stamp 2017-07-05 00:01:08 -04:00
Sylvain Joubert 58f4744821 configure_file: Add support for indented cmakedefine
Optional spaces and/or tabs are now understood between the '#' character
and the 'cmakedefine'/'cmakedefine01' words. This indentation is
preserved in the output lines.

Fixes: #13037
2017-07-04 12:00:02 +02:00
Kitware Robot 74112c8da1 CMake Nightly Date Stamp 2017-07-04 00:01:04 -04:00
Kitware Robot ec64410078 CMake Nightly Date Stamp 2017-07-03 00:01:08 -04:00
Sebastian Holtermann 251bcbed72 Autogen: Continue search for FOO_p.h when FOO.h was found 2017-07-02 22:54:35 +02:00
Kitware Robot 43fc13f825 CMake Nightly Date Stamp 2017-07-02 00:01:04 -04:00
Kitware Robot 0dddf85b6d CMake Nightly Date Stamp 2017-07-01 00:01:06 -04:00
Sebastian Holtermann 83d8aceeb3 Autogen: Check .moc header name against SKIP list
When encountering an #include "FOO.moc" statement where
FOO.hpp was chosen over FOO.cpp as the moc source, the
FOO.hpp name was not checked against the moc SKIP list.
2017-06-30 12:53:24 -04:00
Brad King 2086003145 Merge branch 'vs-link-guard-cf' into release-3.9 2017-06-30 10:57:55 -04:00