Commit Graph

36589 Commits

Author SHA1 Message Date
André Apitzsch
c281acf807 FindProtobuf: add target for protoc 2017-07-12 13:48:22 -04:00
Brad King
107a92ea9a Merge branch 'release-3.9' 2017-07-11 07:42:09 -04:00
Brad King
79e72f4b7c Merge topic 'FindMFC-try-static'
6b2bf575 FindMFC: Check for static MFC variant

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1034
2017-07-11 07:39:15 -04:00
Brad King
de72d5dda6 Merge topic 'file-LOCK-windows-message'
efaf987a cmFileLockResult: Avoid allocation for Windows error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1035
2017-07-11 07:38:54 -04:00
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
Brad King
59e52b3041 Merge topic 'doc_configure_file'
c7d81e16 Help: Explicitly state that some file generations are lazy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1025
2017-07-11 07:35:27 -04:00
Brad King
8d5ec21928 Merge topic 'FindPkgConfig-rerun'
3cf267cf FindPkgConfig: do not always rerun pkg_check_modules() with 2 arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1036
2017-07-11 07:34:58 -04:00
Brad King
8f63f3495d Merge topic 'FindHDF5-windows'
6848ff4c FindHDF5: Define H5_BUILT_AS_DYNAMIC_LIB when using Windows DLLs
6f131f49 FindHDF5: Add support for HDF5_USE_STATIC_LIBRARIES on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1023
2017-07-11 07:34:23 -04:00
Kitware Robot
e1476f9618 CMake Nightly Date Stamp 2017-07-11 00:01:08 -04:00
Rolf Eike Beer
3cf267cfbf FindPkgConfig: do not always rerun pkg_check_modules() with 2 arguments
Since commit v3.8.0-rc1~47^2 (FindPkgConfig: Recheck pkg-config on
parameter change, 2017-01-17) calling `pkg_check_modules` always
re-runs.  The problem is that if there are only 2 arguments passed to
`pkg_check_modules```, then `_module0` will be set and `ARGN` will be
empty.  When this is written to cache it will be stored as just the
value of `_module0` without any semicolon, so on the next run this
doesn't match the expected value and the search is rerun.

Revise the logic to handle the case of empty `ARGN` separately.

Fixes: #17003
2017-07-10 11:16:51 -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
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
Sebastian Holtermann
ecac50e133 Autogen: Skip included files on demand 2017-07-10 13:36:48 +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
Sylvain Joubert
c7d81e16cb Help: Explicitly state that some file generations are lazy
Fixes: #16856
2017-07-07 15:46:35 +02:00
Kris Thielemans
6848ff4ce5 FindHDF5: Define H5_BUILT_AS_DYNAMIC_LIB when using Windows DLLs
When searching for shared libraries on Windows, add
H5_BUILT_AS_DYNAMIC_LIB to HDF5_DEFINITIONS so that the header file
knows how to dllimport the symbols.
2017-07-07 08:58:57 -04:00
Kris Thielemans
6f131f49ee FindHDF5: Add support for HDF5_USE_STATIC_LIBRARIES on Windows
Also add the `_D` suffix for debug libraries.
2017-07-07 08:58:37 -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
Rich Chiodo
6b2bf5756b FindMFC: Check for static MFC variant
Some CMake applications can set /MT without setting CMAKE_MFC_FLAG.
This change lets FindMFC work in those situations.
2017-07-06 11:28:20 -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