mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 12:49:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
40,462 Commits 2 Branches 401 Tags
b0f769ad2da5162f7f65e13061b18b4538f06d9a
Commit Graph

25015 Commits

Author SHA1 Message Date
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 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 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
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 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 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 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
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
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
Vitaly Stakhovsky 4e94f6447a cmGlobalGenerator::AddInstallComponent(): Accept std::string argument 2018-08-30 11:52:45 -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 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
Kitware Robot e04a023eab CMake Nightly Date Stamp 2018-08-30 00:01:09 -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 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
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 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
Kitware Robot c549deed7f CMake Nightly Date Stamp 2018-08-28 00:01:10 -04:00
Vitaly Stakhovsky 50fbfee3a0 cmLocalGenerator: return directories as const std::string& 2018-08-27 15:48:57 -04:00
Vitaly Stakhovsky c8fd23ec6f cmMakefile: return directories as const std::string& 2018-08-27 14:07:43 -04:00
Brad King 4431bb0516 Merge topic 'more-misc-typos' 
aca65a9379 Maint: misc. typos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2301
 2018-08-27 14:05:44 -04:00
Brad King 2cd6ec6fe4 Merge topic 'update-icons' 
66f59bd7da cmake-gui: Update icons

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2295
 2018-08-27 14:05:12 -04:00
Brad King ce153cacc7 Merge topic 'static-lib-options' 
974de0e199 static library: add property STATIC_LIBRARY_OPTIONS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2290
 2018-08-27 14:04:22 -04:00
Brad King fa2ecf7fce Merge topic 'ProjectReference' 
e4ba1f5a94 VS: Disallow ReferenceOutputAssembly in ProjectReference if not possible

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2285
 2018-08-27 14:01:01 -04:00
Brad King 9903ec1677 Merge topic 'ninja-generator-do-not-add-alias-matching-custom-command-output' 
180c2f8de8 Ninja: Fix dupbuild error skipping alias with conflicting custom command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Isaiah <isaiah.norton@gmail.com>
Merge-request: !2276
 2018-08-27 13:57:05 -04:00
Brad King 9e3aee952d Merge topic 'vs2017-no-default-FC' 
1bd768174a VS: Avoid VS 2017 toolset default use of /FC flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alberto Garcia Illera <agarciaillera@gmail.com>
Acked-by: Martin Hořeňovský <martin.horenovsky@gmail.com>
Merge-request: !2306
 2018-08-27 13:52:02 -04:00
Kitware Robot 363fffc736 CMake Nightly Date Stamp 2018-08-27 00:01:05 -04:00
Kitware Robot a175ade62d CMake Nightly Date Stamp 2018-08-26 00:01:06 -04:00
Kitware Robot 0b26ab15c4 CMake Nightly Date Stamp 2018-08-25 00:01:18 -04:00
luz.paz aca65a9379 Maint: misc. typos 
Found via `codespell`.
 2018-08-24 14:58:49 -04:00