Commit Graph

36669 Commits

Author SHA1 Message Date
Kris Thielemans fc9828448d FindHDF5: fix hdf5-config case with more than one configuration
Select a configuration as the first of the following available:

* MAP_IMPORTED_CONFIG_<CONFIG>
* ${CMAKE_BUILD_TYPE}, RELWITHDEBINFO, RELEASE, DEBUG
* First entry in IMPORTED_CONFIGURATIONS

Fixes: #17039
2017-08-03 09:48:19 -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
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
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
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
Brad King 4b460a5ba8 Merge branch 'release-3.9' 2017-07-13 10:08:27 -04:00
Brad King 489a7706c2 Merge topic 'android-system-include-last'
4bafa392 Android: Always add standard include directories last

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1052
2017-07-13 10:07:36 -04:00
Brad King d11c48e0e3 Merge branch 'android-system-include-last' into release-3.9 2017-07-13 10:04:14 -04:00
Brad King 4bafa3922e Android: Always add standard include directories last
The logic added in commit v3.6.0-rc1~30^2 (Add a variable to specify
language-wide system include directories, 2016-05-24) to use
`CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES` incorrectly filters them by
`CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES`.  Rather than recognizing
this, commit v3.8.0-rc1~60^2 (Android: Pass sysroot include directory
explicitly, 2017-01-20) worked around the problem by incorrectly
removing `/usr/include` from `CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES`
so it worked in `CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES`.

By not filtering out `/usr/include` from user-specified include
directories, we allow the code

    include_directories(${CMAKE_SYSROOT}/usr/include)

to place the include directory too early on the command line.

Fix support for standard include directories to not be filtered by
implicit include directories, and do not remove `/usr/include` from the
list of implicit include directories for Android builds.  Add a test
case to verify that an explicit `/usr/include` is ignored in favor
of the standard directory at the end.

Fixes: #17059
2017-07-13 10:03:58 -04:00
Brad King aa97170f2b Merge topic 'win10-sdk-request-mismatch'
80f59ee6 cmGlobalVisualStudio14Generator: notify when the SDK version doesn't match

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !866
2017-07-13 08:23:56 -04:00
Ben Boeckel 80f59ee602 cmGlobalVisualStudio14Generator: notify when the SDK version doesn't match
When requesting an SDK version which is not suitable (e.g., missing
`windows.h`), CMake will use the next-best SDK version. Output a message
when CMake chooses something different than the requested SDK version.

See #16895.
2017-07-13 08:10:57 -04:00
Brad King a4a39a46c3 Merge topic 'FindProtobuf-protoc-target'
c281acf8 FindProtobuf: add target for protoc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1045
2017-07-13 07:52:09 -04:00
Brad King 47d9772618 Merge topic 'better-exception-reporting'
0c650f39 CTest: Report more detail about system exceptions in tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1046
2017-07-13 07:51:05 -04:00
Brad King 0f158272d6 Merge topic 'test_include_files'
117033c1 Add TEST_INCLUDE_DIR[S] unit test
ed5bde30 Add TEST_INCLUDE_FILES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1031
2017-07-13 07:46:47 -04:00
Brad King f5be951117 Merge topic 'labels-for-subprojects'
376dc3eb Help: Add notes for topic 'labels_for_subprojects'
a70d8e93 Add tests for new directory labels and labels-for-subprojects features
47b3a57c Display subproject timing summary
d3859624 Add directory property 'LABELS' and CMAKE_DIRECTORY_LABELS variable
d08ec4d2 Add CTEST_LABELS_FOR_SUBPROJECTS as a CTest module and script variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1004
2017-07-13 07:46:09 -04:00
Brad King 37915a6930 Merge topic 'ninja-dyndep-response-file'
4ef0eedb Ninja: always use response file for cmake_ninja_dyndep

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1038
2017-07-13 07:45:11 -04:00
Brad King e5c762d32d Merge topic 'server-target-backtraces'
0c572382 server: Report backtraces in codemodel response
4db32275 server: Rename cmServerProtocol1_0 to cmServerProtocol1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !992
2017-07-13 07:44:11 -04:00
Brad King c8f4cf0821 Merge topic 'source-group-regex-tweaks'
2c82d9c8 Add more extensions to Resources source group by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1028
2017-07-13 07:42:42 -04:00
Kitware Robot 3d209acc1f CMake Nightly Date Stamp 2017-07-13 00:01:06 -04:00
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
André Apitzsch c281acf807 FindProtobuf: add target for protoc 2017-07-12 13:48:22 -04:00
Brad King 75cbc5611d Merge branch 'release-3.8' 2017-07-12 13:38:02 -04:00
Brad King 23fb573c5f Merge branch 'backport-ep-log-no-extract-fix' into release-3.8 2017-07-12 13:37:54 -04:00
Bill Hoffman 0c650f3965 CTest: Report more detail about system exceptions in tests
This passes the system exception string up to CDash and to the command line
instead of just printing "other".
2017-07-12 13:29:21 -04:00