Commit Graph

36570 Commits

Author SHA1 Message Date
Brad King fda50a0843 CMakePushCheckState: Fix cmake_push_check_state RESET argument
This option was added by commit v2.8.12~138^2 (Add
cmake_reset_check_state() macro, 2013-07-28) but has never worked.
Fix the implementation to refer to macro arguments properly (not as
normal variables).

Fixes: #17048
2017-07-12 15:09:16 -04:00
Brad King 1fda77d455 Merge branch 'release-3.9' 2017-07-10 10:23:56 -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
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
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 2ef3527dfe Merge branch 'release-3.9' 2017-07-07 08:43:39 -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
Brad King a951eb2cb4 Merge topic 'FindDoxygen-create-output-dir'
796b8fcb FindDoxygen: Create DOXYGEN_OUTPUT_DIRECTORY if it doesn't exist

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !1019
2017-07-07 08:41:04 -04:00
Kitware Robot 17115f0a5b CMake Nightly Date Stamp 2017-07-07 00:01:07 -04:00
Brad King 658ecc1a7c Merge branch 'FindDoxygen-create-output-dir' into release-3.9 2017-07-06 11:13:51 -04:00
Robert Dailey 796b8fcb14 FindDoxygen: Create DOXYGEN_OUTPUT_DIRECTORY if it doesn't exist
If the doxygen output directory does not exist, create it prior to
running the doxygen commands.
2017-07-06 10:00:28 -05:00
Brad King ecadc1495b Merge branch 'release-3.9' 2017-07-06 10:13:51 -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 1c73f354a3 Merge topic 'clang-format-missing'
16d49525 clang-format.bash: Fix error message when clang-format is not found

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1029
2017-07-05 12:56:55 -04:00
Brad King 16d495253b clang-format.bash: Fix error message when clang-format is not found
Do not refer to a variable we just determined is empty to get the
name of the tool for the error message.  Just hard-code the name.
2017-07-05 12:55:03 -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 295d9bf2bd Merge branch 'release-3.9' 2017-07-05 10:28:38 -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
Olender, Sebastian D 82a5c2c6a5 VS: Fix support for '/guard:cf' linker flag
Although `$(VCTargetsPath)/1033/link.xml` for v140 and v141 toolsets
contains an entry for `LinkControlFlowGuard`, it does not work when used
in a `.vcxproj` file.  Drop our link flag table entries for these
toolsets so that the flag will be passed via `AdditionalOptions`.
2017-06-30 10:57:40 -04:00
Brad King c705f0af63 Merge branch 'release-3.9' 2017-06-30 10:51:16 -04:00
Brad King b6cbbbe129 Merge topic 'server-mode-protocol-version-docs'
ab533e48 Help: Document server-mode protocol versions more clearly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1015
2017-06-30 10:32:22 -04:00
Brad King 15c5d9a0dd Merge topic 'xcode-cross-sdk-object-libraries'
c2a6df94 Xcode: Use correct Object Library paths for cross-SDK builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1016
2017-06-30 10:32:02 -04:00
Brad King bcca01d8ad Merge topic 'FindDoxygen-project-in-subdir'
97a9a356 FindDoxygen: Use a stable reference to the location of global resources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1014
2017-06-30 10:17:29 -04:00
Brad King d3234a8a48 Merge branch 'FindDoxygen-project-in-subdir' into release-3.9 2017-06-30 10:16:35 -04:00
Brad King bc92960b63 Merge branch 'xcode-cross-sdk-object-libraries' into release-3.9 2017-06-30 10:16:30 -04:00
Kitware Robot db96ebaa7b CMake Nightly Date Stamp 2017-06-30 00:01:06 -04:00
Robert Dailey 97a9a35607 FindDoxygen: Use a stable reference to the location of global resources
FindDoxygen generates some files based on the version of Doxygen whose
content will not vary across a project and are therefore a global
resource that can be shared by all calls to `find_package(Doxygen)` and
to `doxygen_add_docs`.  We currently use `${PROJECT_BINARY_DIR}` to
reference their location, but this is not stable because `project()`
calls in a subdirectory can change it.  Use `${CMAKE_BINARY_DIR}`
instead.

Reviewed-by: Craig Scott <craig.scott@crascit.com>
Fixes: #17022
2017-06-29 13:39:26 -05:00