40540 Commits

Author SHA1 Message Date
Brad King
8c2d1fb7a3 Merge branch 'release-3.12' 2018-08-31 14:46:41 -04:00
Brad King
388bf1feee Merge topic 'CheckIPOSupported-output-backslashes'
4e1ea02bb8 CheckIPOSupported: Tolerate backslashes in output of failed checks
b7dbb25a0a CheckIPOSupported: Simplify result reporting logic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2331
2018-08-31 14:46:02 -04:00
Brad King
e16568c293 Merge topic 'file-alt-httpauth'
31301b46a7 file: Allow DOWNLOAD/UPLOAD using alternate authentication methods

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2320
2018-08-31 14:45:11 -04:00
Brad King
e48a278cdc Merge topic 'no-sanitizer-logfile'
5aaaee5e9e ctest_memcheck: Change failure to find log file from error to warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2323
2018-08-31 14:44:32 -04:00
Brad King
2ba1c7fc9e Merge topic 'ctest-WARNING-not-error'
fde61d3ad3 CTest: Add error exception for sphinx-build WARNING messages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2325
2018-08-31 14:42:50 -04:00
Brad King
e58a13c546 Merge topic 'solaris-silence-system-libform-warning'
ce3cd1a89b Solaris: Silence warning when using system libform.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2330
2018-08-31 14:41:28 -04:00
Craig Scott
16225c28d0 Merge topic 'capture_camke_error-update-docs'
5fc11b34e4 Help: Add CAPTURE_CMAKE_ERROR to ctest_submit and ctest_update documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2324
2018-08-31 04:39:27 -04:00
Kitware Robot
4af79b6825 CMake Nightly Date Stamp 2018-08-31 00:01:10 -04:00
Justin Goshi
d74c2282ea cmake-server: Support codemodel filegroups for INTERFACE_SOURCES
This change returns information for INTERFACE_SOURCES. We add
a flag to the filegroup to indicate if the target represents
interface sources.

Protocol version is updated to 1.3 since this is a change to what was
released in cmake version 3.12.
2018-08-30 16:09:22 -07:00
David Faure
7a7e94d6f7 CPack (DEB/RPM): add test for per-component description/summmary. 2018-08-30 22:08:11 +02:00
Mikhail Korolev
e78a0c8e8a VS: Add option to tell generator that platfrom is WinRT by default
Create a ``CMAKE_VS_WINRT_BY_DEFAULT`` variable to indicate this.

Fixes: #18286
2018-08-30 12:46:57 -04:00
Brad King
80bb9214dd Merge branch 'CheckIPOSupported-output-backslashes' into release-3.12
Merge-request: !2331
2018-08-30 11:53:40 -04:00
Vitaly Stakhovsky
4e94f6447a cmGlobalGenerator::AddInstallComponent(): Accept std::string argument 2018-08-30 11:52:45 -04:00
Brad King
4e1ea02bb8 CheckIPOSupported: Tolerate backslashes in output of failed checks
Avoid passing the output of our `try_compile` through a macro argument.
Macro invocations re-parse their arguments and so should not be given
arbitrary content that may contain backslashes and such.

Instead pass a simple message.  This is also more readable in the case
that the macro generates a message itself.  After the macro returns,
report the real output directly to the variable named by our caller.
Also record the output in a log file as other checks do on failure.

Fixes: #18244
2018-08-30 11:46:19 -04:00
Brad King
b7dbb25a0a CheckIPOSupported: Simplify result reporting logic
Simplify the test for whether a `RESULT` argument was given to the
`check_ipo_supported` call.  Also do not set an empty variable name
if `OUTPUT` was not given.
2018-08-30 11:45:13 -04:00
Hubertus van Dam
8cdff15ef7 FindBLAS: Make Intel MKL the most preferred explicit BLAS library again
By adding the "if (NOT BLAS_LIBRARIES)" statement to the Intel MKL
detection code block we have unintentionally turned Intel MKL from
the most preferred into the least preferred BLAS library. To fix
this issue the Intel MKL detection code block needs to be moved
forward to make it the first explicit BLAS library we test for.
This is change does just that and re-instates Intel MKL as the
most preferred explicit BLAS library.
2018-08-30 10:52:59 -04:00
Hubertus van Dam
608de88f29 FindBLAS: Make Intel MKL code block respect prior found BLAS libraries
All non-Intel BLAS library detection blocks have an if-statement
"if (NOT BLAS_LIBRARIES)" to ensure that if a BLAS library was
found we are not going to try and find another one. This causes
a problem when we have already found that we do not need to specify
a BLAS library, as the Intel MKL library takes precedence over
everything. Introducing the "if (NOT BLAS_LIBRARIES)" if-statement
fixes this problem.
2018-08-30 10:52:59 -04:00
Hubertus van Dam
5b8f69ebe9 FindBLAS: Detect implicitly linked BLAS library
Run the Check_Fortran_Libraries macro with an *empty* list of libraries
to detect whether the compiler implicitly links BLAS.  If this works,
set `BLAS_LIBRARIES` to a placeholder value to get through the rest of
our logic.  At the end replace the placeholder by a real empty string
again to report to callers.
2018-08-30 10:51:20 -04:00
Kitware Robot
2c807b75f3 FindBLAS: Re-indent module source code to use normal conventions 2018-08-30 10:42:09 -04:00
Clinton Stimpson
31301b46a7 file: Allow DOWNLOAD/UPLOAD using alternate authentication methods 2018-08-30 10:38:28 -04:00
Tim
fde61d3ad3 CTest: Add error exception for sphinx-build WARNING messages
Sphinx-build warnings look like this:

    ../path/to/file.rst:105: WARNING: This is not an error.

CTest detects these as errors by this regex:

    ([^ :]+):([0-9]+): ([^ \\t])

Add an exception as we already have for lower-case `: warning`.
2018-08-30 10:02:38 -04:00
Brad King
5563d6b3a6 Merge topic 'minor-cleanup'
fb73edf70c cmake: Drop unnecessary working mode checks
bd7dd6d414 cmake: Declare VariableWatch member only when used

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2326
2018-08-30 09:25:51 -04:00
Brad King
b11e021bed Merge topic 'cpack-ext-stage-and-run'
4a0f664aaf CPackExt: Add CPACK_EXT_ENABLE_STAGING and CPACK_EXT_PACKAGE_SCRIPT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2272
2018-08-30 09:24:31 -04:00
Brad King
e3a521f02b Merge topic 'FindPackageModeMakefileTest-use-explicit-linkage'
03f22cd188 FindPackageModeMakefileTest: Explicitly use C linkage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2328
2018-08-30 09:23:39 -04:00
Brad King
0d44d48232 Merge topic 'libarchive-bump-minimum-version'
da1dc4e450 libarchive: Bump the minimum version from 3.0.0 to 3.1.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2327
2018-08-30 09:22:35 -04:00
Brad King
eeb5bb7fe1 Merge topic 'cmake_lang_compiler_predefines'
83f2d48388 Respect CMAKE_<LANG>_COMPILER_ARG1 in CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2316
2018-08-30 09:21:31 -04:00
Brad King
69aaf9b63b Merge topic 'cstr-remove'
95084a313d cmVisualStudio10TargetGenerator: clean up c_str()s

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2322
2018-08-30 09:19:40 -04:00
Brad King
d879999534 Merge topic 'genex-evaluate-stdstring'
65ab9ce938 Genex: Return Evaluate results as const std::string&

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2314
2018-08-30 09:18:58 -04:00
Brad King
17a60e398c Merge topic 'remove-lua-extra-paths'
2bd71f6377 FindLua: Remove manually specified additional paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Rolf Eike Beer <eike@sf-mail.de>
Merge-request: !2321
2018-08-30 09:17:47 -04:00
Brad King
8f37b90b58 Merge branch 'release-3.12' 2018-08-30 09:15:06 -04:00
Brad King
14553ab64b Merge topic 'android-ndk-r18'
ca97d4cb5f Android: Add support for NDK r18

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2319
2018-08-30 09:14:32 -04:00
Kitware Robot
e04a023eab CMake Nightly Date Stamp 2018-08-30 00:01:09 -04:00
Chuck Atkins
ce3cd1a89b Solaris: Silence warning when using system libform. 2018-08-29 16:11:02 -04:00
Chuck Atkins
03f22cd188 FindPackageModeMakefileTest: Explicitly use C linkage
This explicitly uses C linkage for the library code used by the test to work
around some compilers (Solaris Studio 12.4) that implicitly assume incorrect
linkage information.  Since something else entirely is being tested here,
this allows the test to proceed as needed on the affected platforms.
2018-08-29 13:02:09 -04:00
Chuck Atkins
da1dc4e450 libarchive: Bump the minimum version from 3.0.0 to 3.1.0
cmArchiveWrite uses the gzip:timestamp write filter option which was not
available until v3.1.0.
2018-08-29 11:20:11 -04:00
Brad King
fb73edf70c cmake: Drop unnecessary working mode checks
In `cmake::Run` we return before `Configure` or `Generate` when
not working in normal mode so they do not need mode checks.

While at it, remove a long-outdated comment about when to save the
cache.
2018-08-29 09:38:32 -04:00
Brad King
bd7dd6d414 cmake: Declare VariableWatch member only when used 2018-08-29 09:38:32 -04:00
Kitware Robot
6783fac20a CMake Nightly Date Stamp 2018-08-29 00:01:12 -04:00
Betsy McPhail
5fc11b34e4 Help: Add CAPTURE_CMAKE_ERROR to ctest_submit and ctest_update documentation
Also, added CAPTURE_CMAKE_ERROR to vim synax file for ctest_submit,
ctest_update and ctest_memcheck.
2018-08-28 21:09:53 -04:00
Betsy McPhail
5aaaee5e9e ctest_memcheck: Change failure to find log file from error to warning
Sanitizers do not create a log file when no defects are found. Therefore,
it is currently impossible for ctest_memcheck to set both
`CAPTURE_CMAKE_ERROR` and `RETURN_VALUE` to zero.


With defects, `CAPTURE_CMAKE_ERROR`=0 and `RETURN_VALUE`=-1, as expected.

With no defects, `CAPTURE_CMAKE_ERROR`=-1 and `RETURN_VALUE`=0.
2018-08-28 16:45:49 -04:00
Vitaly Stakhovsky
95084a313d cmVisualStudio10TargetGenerator: clean up c_str()s 2018-08-28 14:41:19 -04:00
Sebastian Holtermann
83f2d48388 Respect CMAKE_<LANG>_COMPILER_ARG1 in CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND
AUTOMOC used to fail to generate ``moc_predefs.h`` when ``ccache`` was used
as a compiler starter by e.g. configuring a project with the environment
variable CXX="ccache g++".
The reason was that ``CMAKE_<LANG>_COMPILER_ARG1`` wasn't respected in the
definition of ``CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND`` for various
compilers.  This is fixed by this patch.

Fixes #17275.
2018-08-28 20:07:53 +02:00
Vitaly Stakhovsky
65ab9ce938 Genex: Return Evaluate results as const std::string&
Also remove unused overloads.
2018-08-28 13:56:29 -04:00
Brad King
ca7507cebc Merge topic 'FindMatlab-missing-install'
7d9640dbc2 FindMatlab: Guard against nonexistent installation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2318
2018-08-28 13:52:17 -04:00
Brad King
9da844d8cb Merge topic 'lg-directory'
50fbfee3a0 cmLocalGenerator: return directories as const std::string&

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2309
2018-08-28 13:43:48 -04:00
Brad King
6f7c96fb17 Merge topic 'mk-directory'
c8fd23ec6f cmMakefile: return directories as const std::string&

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2311
2018-08-28 13:42:43 -04:00
Chuck Atkins
2bd71f6377 FindLua: Remove manually specified additional paths
The additional paths specified are already accounted for in the appropriate
Platform files.
2018-08-28 13:27:35 -04:00
Brad King
0e764082fe Merge branch 'android-ndk-r18' into release-3.12
Merge-request: !2319
2018-08-28 09:44:03 -04:00
Brad King
ca97d4cb5f Android: Add support for NDK r18
NDK r18 drops GCC toolchains and some STL types.  We need to choose a
clang toolchain by default when no gcc toolchains are available.  Switch
the STL type default to `c++_static` when the old `gnustl_static`
default is not available.

Update the test suite to not run tests for STL types that do not exist.
Also do not expect the gcc toolchain `cpp` tool to be available because
r18 does not provide it.  Also teach it to tolerate `gcc -dumpmachine`
output like `arm--linux-android` that differs from the toolchain prefix.

Fixes: #18301
2018-08-28 09:27:26 -04:00
Kitware Robot
c549deed7f CMake Nightly Date Stamp 2018-08-28 00:01:10 -04:00