mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-06 15:19:56 -06:00
Code Issues Packages Projects Releases Wiki Activity
40,474 Commits 2 Branches 390 Tags
b218841079a71671a0ac6c8ad287cddeb66386e7
Commit Graph

40474 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot
b218841079 CMake Nightly Date Stamp 2018-09-07 00:01:11 -04:00
Brad King
f782759ed0 Merge topic 'CMakeFindBinUtils-fix-not-cached' 
53bae4cc5e CMakeFindBinUtils: Fix use with non-cached tool settings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2355
 2018-09-06 10:00:25 -04:00
Brad King
036db90b9d Merge branch 'release-3.12' 2018-09-06 09:57:08 -04:00
Brad King
488faed3ce Merge topic 'FindMatlab-no-CMAKE_CL_64' 
bfe883af60 FindMatlab: Remove erroneous duplicate code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2354
 2018-09-06 09:56:36 -04:00
Brad King
e1ebec55d4 Merge topic 'grd-stdstring' 
4d89830d71 cmMakefile: Make GetRequiredDefinition return std::string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2347
 2018-09-06 09:54:56 -04:00
Brad King
3ecbe1987d Merge topic 'isonoff-cstr' 
6f16be6a62 Remove unnecessary c_str() calls

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2346
 2018-09-06 09:54:18 -04:00
Kitware Robot
6d2a2fe660 CMake Nightly Date Stamp 2018-09-06 00:01:09 -04:00
Brad King
3dd926f4a8 Merge branch 'FindMatlab-no-CMAKE_CL_64' into release-3.12 
Merge-request: !2354
 2018-09-05 15:20:03 -04:00
Raffi Enficiaud
bfe883af60 FindMatlab: Remove erroneous duplicate code 
This was left accidentally when resolving merge conflicts between
previous changes.

Fixes: #18221
 2018-09-05 15:19:50 -04:00
Vitaly Stakhovsky
4d89830d71 cmMakefile: Make GetRequiredDefinition return std::string 
In all cases the return value is converted to std::string anyway.

Also remove unnecessary `c_str()` calls in arguments to
`GetRequiredDefinition`.
 2018-09-05 15:15:55 -04:00
Vitaly Stakhovsky
6f16be6a62 Remove unnecessary c_str() calls 
Use the new IsOn(),IsOff() overloads.
 2018-09-05 15:12:57 -04:00
Brad King
53bae4cc5e CMakeFindBinUtils: Fix use with non-cached tool settings 
If a project or toolchain file hard-codes a tool location such as
`CMAKE_LINKER` with a plain `set()` then the value will be stored
in compiler information files but not cached.  If the value is
not cached then we should not mark it as advanced because doing
so will initialize an empty cache entry.

Fixes: #18315
 2018-09-05 15:03:02 -04:00
Brad King
b0f769ad2d Merge topic 'cmake-gui-align-text' 
13a2751ca6 cmake-gui: Align source and binary directory path text

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2344
 2018-09-05 14:40:26 -04:00
Brad King
182522a209 Merge branch 'release-3.12' 2018-09-05 14:36:47 -04:00
Brad King
b6524f6f34 Merge topic 'vs-CMakeLists.txt' 
0b82e68f2f VS: Restore CMakeLists.txt references in each target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2349
 2018-09-05 14:35:46 -04:00
Brad King
925b95fbad Merge branch 'vs-CMakeLists.txt' into release-3.12 
Merge-request: !2349
 2018-09-05 14:33:06 -04:00
Brad King
0b82e68f2f VS: Restore CMakeLists.txt references in each target 
The custom command de-duplication added by commit v3.12.0-rc1~171^2 (VS:
Generate a custom command only in the least dependent target,
2018-03-23) accidentally also applied to the `CMakeLists.txt` file
reference we put in each target.  This file reference comes with a
custom command that has no dependencies and that is safe to run
repeatedly across multiple targets (via internal stamp checking).
Therefore it should be excluded from the de-duplication so that
`CMakeLists.txt` references appear in all targets for human reference.

Fixes: #18310
 2018-09-05 14:32:45 -04:00
Brad King
cb800ebb83 Merge topic 'FindBoost-old-context' 
9a800c12fc FindBoost: Fix context discovery for 1.60 and below

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2348
 2018-09-05 14:32:27 -04:00
Kitware Robot
cc5bac458b CMake Nightly Date Stamp 2018-09-05 00:01:09 -04:00
Zeex
13a2751ca6 cmake-gui: Align source and binary directory path text 
Text inputs for "where is the source code" and "where to build the
binaries" had different amount of left spacing, so the two paths were
not aligned. This could create a feeling that you typed something wrong
in the input even though the paths were identical or had a common root
path.
 2018-09-04 13:01:00 -04:00
Brad King
6be7097dbe Merge branch 'FindBoost-old-context' into release-3.12 
Merge-request: !2348
 2018-09-04 12:43:12 -04:00
Igor Kostenko
9a800c12fc FindBoost: Fix context discovery for 1.60 and below 
* `all.hpp` was removed in 1.68:
  2e37599461
* `fcontext.hpp` was moved to detail in 1.61:
  c2f0dfdf26

Fixes: #18126
 2018-09-04 12:41:36 -04:00
Brad King
612975c665 Merge topic 'cpack_test' 
7a7e94d6f7 CPack (DEB/RPM): add test for per-component description/summmary.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2333
 2018-09-04 09:59:12 -04:00
Brad King
69ce062969 Merge topic 'cmakeServerSourcesForInterfaceLibraries' 
d74c2282ea cmake-server: Support codemodel filegroups for INTERFACE_SOURCES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Tobias Hunger <tobias.hunger@gmail.com>
Acked-by: Markus Enzenberger <markus.enzenberger@gmail.com>
Merge-request: !2282
 2018-09-04 09:57:58 -04:00
Brad King
0a1426f008 Merge topic 'improve-isonoff' 
1bfe6991ff cmSystemTools: Re-implement IsOn,IsOff with manual branching
1fa0f2bd03 cmSystemTools: Add IsOn(),IsOff() overloads accepting std::string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: vvs31415 <vstakhovsky@fastmail.com>
Merge-request: !2336
 2018-09-04 09:57:22 -04:00
Kitware Robot
6b5f4ff929 CMake Nightly Date Stamp 2018-09-04 00:01:06 -04:00
Kitware Robot
0878a79414 CMake Nightly Date Stamp 2018-09-03 00:01:08 -04:00
Kitware Robot
d5a12cc84d CMake Nightly Date Stamp 2018-09-02 00:01:09 -04:00
Kitware Robot
ef5022e8c6 CMake Nightly Date Stamp 2018-09-01 00:01:24 -04:00
Brad King
1bfe6991ff cmSystemTools: Re-implement IsOn,IsOff with manual branching 
Replace use of std::string allocation, std::set lookups, and toupper
conversions with explicit manual logic to do case-insensitive
recognition of a specific set of strings.
 2018-08-31 14:58:03 -04:00
Vitaly Stakhovsky
1fa0f2bd03 cmSystemTools: Add IsOn(),IsOff() overloads accepting std::string 2018-08-31 14:58:03 -04:00
Brad King
ed80d89b98 Merge topic 'FindBLAS-implicit-blas-final' 
8cdff15ef7 FindBLAS: Make Intel MKL the most preferred explicit BLAS library again
608de88f29 FindBLAS: Make Intel MKL code block respect prior found BLAS libraries
5b8f69ebe9 FindBLAS: Detect implicitly linked BLAS library
2c807b75f3 FindBLAS: Re-indent module source code to use normal conventions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2312
 2018-08-31 14:51:13 -04:00
Brad King
5a02afd920 Merge topic 'vs-winrt-default' 
e78a0c8e8a VS: Add option to tell generator that platfrom is WinRT by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2315
 2018-08-31 14:50:27 -04:00
Brad King
28979843d1 Merge topic 'gg-stdstring' 
4e94f6447a cmGlobalGenerator::AddInstallComponent(): Accept std::string argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2332
 2018-08-31 14:49:29 -04:00
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