mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-07 04:02:23 +03:00
Code Activity
47,352 Commits 2 Branches 415 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph
47352 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bartosz Kosiorek ea9a2c1759 cmake: tar: Parse 'cmake -E tar' arguments 2019-03-20 09:28:49 -04:00
Regina Pfeifer 35e09c7aef testRange: Make sure tests can actually fail 2019-03-20 06:16:58 +01:00
Kitware Robot 51f3a76ab2 CMake Nightly Date Stamp 2019-03-20 00:01:06 -04:00
Rolf Eike Beer eea9eda834 remove some platform specific search paths from Find modules 
These are added through CMAKE_SYSTEM_PREFIX_PATH on the platforms automatically.
 2019-03-19 23:49:11 +01:00
Kyle Edwards 8c0b7aa17d Merge topic 'cmake--install' 
73f23d1e00 cmake: add '--install <dir>' option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Acked-by: Bartosz <gang65@poczta.onet.pl>
Acked-by: Cristian Adam <cristian.adam@gmail.com>
Rejected-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !3069
 2019-03-19 13:39:18 -04:00
Kyle Edwards f1e53266e9 Merge topic 'improve-tar-command' 
8634576dcb cmake: Don't interrupt archive creation if unable to read a file.
c7c6a4a2cc Help: Update 'tar' documentation with supported arguments
7c47fd8cd1 cmake: tar: Display warning when no files provided during archive creation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3080
 2019-03-19 13:37:59 -04:00
Bartosz Kosiorek 8f723e48b8 ExternalProject: Optimize Mercurial commands 2019-03-19 15:17:55 +01:00
Bartosz Kosiorek bca0c16223 ExternalProject: Optimize git commands 2019-03-19 15:17:35 +01:00
Brad King b52d9d6960 cmSystemTools: Drop unused CollapseCombinedPath method 
All call sites have been converted to `CollapseFullPath`, so the
now-unused `CollapseCombinedPath` can be removed.

Fixes: #19050
 2019-03-19 10:00:08 -04:00
Brad King a13a5c948e Replace use of CollapseCombinedPath with CollapseFullPath 
`CollapseCombinedPath` was introduced by commit 551d3343cd (cmDependsC:
Collapse relative include paths, 2013-06-19, v2.8.12~237^2) where the
existing `CollapseFullPath` should have been used instead.  Then its use
proliferated slightly.  Since `CollapseCombinedPath` is less widely used
and less robust (see issue #19049), use `CollapseFullPath` everywhere
instead.

Issue: #19050
 2019-03-19 09:57:23 -04:00
Brad King d2101e944a Merge topic 'xcodegen-use-std-string' 
482d9ef9a8 cmGlobalXCodeGenerator: Prefer std::string over char*

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3111
 2019-03-19 08:59:23 -04:00
Brad King 3c4f92cf5b Merge topic 'is-valid-utf8' 
53184a727d cm_utf8: add an is_valid function

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3104
 2019-03-19 08:58:39 -04:00
Brad King 6bbc82b4b3 Merge topic 'CheckTypeSize-decl-warning' 
0adb0e0178 CheckTypeSize: Fix with clang '-Werror,-Wmissing-variable-declarations'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3112
 2019-03-19 08:57:51 -04:00
Brad King 51a1a7e64f Merge topic 'FindBLAS-mklroot' 
90b7758489 FindBLAS: respect MKLROOT and MKL_ROOT if available

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3108
 2019-03-19 08:56:37 -04:00
Brad King 0587c4b247 Merge topic 'file_time_comparison' 
ec3c968de2 cmake: Use scopes to limit temporary object lifetime
1de0c827a1 cmDependsC: Read cache file modification time only once
5536cec46e Rename cmFileTimeCache::FileTimeCompare to cmFileTimeCache::Compare
98d4846953 Rename cmFileTimeCache::FileTimesDiffer to cmFileTimeCache::DifferS
a6d75a1ce0 Substitute FileComparison in variable names with FileTimeCache
216416219a Rename cmFileTimeComparison to cmFileTimeCache
3160258393 cmFileTimeComparison: Replace anonymous private class with std::map
103aa9e46a cmFileTimeComparison: Use cmFileTime internally
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !3101
 2019-03-19 08:55:18 -04:00
Brad King 146b959491 Merge topic 'environment-modules' 
dfea916d3c FindEnvModules: Provide a CMake interface to environment modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3076
 2019-03-19 08:53:35 -04:00
Brad King a9a4f3b193 Merge topic 'cray-bad-compiler-option' 
c213e34d0c cray: Detect bad options passed on the command line

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3110
 2019-03-19 08:52:11 -04:00
Kitware Robot e67e4dbaad CMake Nightly Date Stamp 2019-03-19 00:01:08 -04:00
Regina Pfeifer 46090c2337 cmCTest: Store TestingHandlers by value 2019-03-18 22:55:51 +01:00
Regina Pfeifer da5ee509b2 cmCTest: Move all data members to private implementation struct 2019-03-18 22:55:50 +01:00
Regina Pfeifer 670d27da64 cmCTest: Remove friend declarations 2019-03-18 22:25:50 +01:00
Regina Pfeifer 9406844616 cmCTest: De-inline all member functions 2019-03-18 22:25:50 +01:00
Ben Boeckel 53184a727d cm_utf8: add an is_valid function 2019-03-18 14:18:13 -04:00
Bartosz Kosiorek 8634576dcb cmake: Don't interrupt archive creation if unable to read a file. 
Rationale:
Currently during creation of archive by 'tar',
if error appears, it interrupt archive creation.
As a result only part of files are archived

This behaviour is not consistent with 'copy_directory', native 'tar'
and other command behaviour.
With this Merge Request this behaviour is fixed.
 2019-03-18 17:55:35 +01:00
Bartosz Kosiorek c7c6a4a2cc Help: Update 'tar' documentation with supported arguments 2019-03-18 17:08:20 +01:00
Bartosz Kosiorek 7c47fd8cd1 cmake: tar: Display warning when no files provided during archive creation 2019-03-18 17:08:20 +01:00
Campbell Barton 0adb0e0178 CheckTypeSize: Fix with clang '-Werror,-Wmissing-variable-declarations' 
Resolve issue building with missing variable declarations, error:

```
/src/cmake_clang/CMakeFiles/CheckTypeSize/CMAKE_SIZEOF_UNSIGNED_LONG.c:24:6: error: no previous extern declaration for non-static variable 'info_size' [-Werror,-Wmissing-variable-declarations]
char info_size[] =  {'I', 'N', 'F', 'O', ':', 's','i','z','e','[',
     ^
1 error generated.
```
 2019-03-18 11:56:39 -04:00
Chuck Atkins dfea916d3c FindEnvModules: Provide a CMake interface to environment modules 2019-03-18 11:47:35 -04:00
Brad King 875f49cc58 Merge topic 'utf8-fixes' 
fb5de060bc cm_utf8: reject codepoints above 0x10FFFF
a11e5e021b cm_utf8: reject UTF-16 surrogate half codepoints
7111873efd testUTF8: add more test cases
bba2b1c89b testUTF8: comment why sequences are invalid

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3097
 2019-03-18 11:28:52 -04:00
Brad King f6cbb02b59 Merge topic 'ExternalProject-optimize-git' 
c58f5e116e ExternalProject: Extend documentation about GIT_TAG usage
8355665f8d ExternalProject: Drop unnecessary 'git submodule init'
00b5f1a1b5 ExternalProject: Simplify generated 'git clone' scripts
98e6822fdf ExternalProject: Re-run 'git clone' when GIT_REMOTE_NAME changes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3095
 2019-03-18 11:27:59 -04:00
Brad King 23874e4078 Merge topic 'FindGLEW-updates' 
a77a30e657 FindGLEW: Add test
a7d853868b FindGLEW: Update implementation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3094
 2019-03-18 11:26:49 -04:00
Brad King 4480769f8b Merge topic 'release_note_for_cuda_compiler_generator_expressions' 
380b2dae55 Add a release note for the cuda compiler generator expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3109
 2019-03-18 11:25:22 -04:00
Brad King 8d179cce87 Merge topic 'import-zstd' 
80af3ddea7 zstd: Disable BMI2 instructions for build within CMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3107
 2019-03-18 11:24:30 -04:00
Sebastian Holtermann ec3c968de2 cmake: Use scopes to limit temporary object lifetime 2019-03-18 15:09:11 +01:00
Sebastian Holtermann 1de0c827a1 cmDependsC: Read cache file modification time only once 
Using cmFileTime to store and compare file times in cmDependsC allows us to
read the cache file modification time only once instead of over and over again
for each comparison.
 2019-03-18 15:09:11 +01:00
Sebastian Holtermann 5536cec46e Rename cmFileTimeCache::FileTimeCompare to cmFileTimeCache::Compare 2019-03-18 15:09:11 +01:00
Sebastian Holtermann 98d4846953 Rename cmFileTimeCache::FileTimesDiffer to cmFileTimeCache::DifferS 2019-03-18 15:09:11 +01:00
Sebastian Holtermann a6d75a1ce0 Substitute FileComparison in variable names with FileTimeCache 2019-03-18 15:09:11 +01:00
Sebastian Holtermann 216416219a Rename cmFileTimeComparison to cmFileTimeCache 
The name `cmFileTimeCache` reflects the functionality of the class more
appropriately.
 2019-03-18 15:09:11 +01:00
Sebastian Holtermann 3160258393 cmFileTimeComparison: Replace anonymous private class with std::map 
After the switch to `cmFileTime`, the anonymous private class of
`cmFileTimeComparison` held only a `std::map`.  This moves the
`std::map` to the `cmFileTimeComparison` class itself and removes the
instantiation of an anonymous private class.
 2019-03-18 15:09:10 +01:00
Sebastian Holtermann 103aa9e46a cmFileTimeComparison: Use cmFileTime internally 
This replaces OS dependent code in `cmFileTimeComparison` with `cmFileTime`
instances that provide the required file time load and comparison operations.

A new public `cmFileTimeComparison::Load` method is introduced that,
for a given file name, updates the `cmFileTimeComparison` cache on demand and
returns a `cmFileTime` instance on success.
 2019-03-18 15:09:10 +01:00
Sebastian Holtermann 6f24c4e93f New cmFileTime class 
The new cmFileTime class stores the file modification time as an OS independent
nanosecond count.  Its main use is to load and compare file modification times
in nanosecond and second resolution.
 2019-03-18 15:09:10 +01:00
Kitware Robot b06f8c93e5 CMake Nightly Date Stamp 2019-03-18 00:01:06 -04:00
Gregor Jasny 482d9ef9a8 cmGlobalXCodeGenerator: Prefer std::string over char* 2019-03-17 20:41:35 +01:00
Kitware Robot 283330976f CMake Nightly Date Stamp 2019-03-17 00:01:07 -04:00
Jiang Yi 73f23d1e00 cmake: add '--install <dir>' option 
Fixes: #19023
 2019-03-17 01:31:25 +08:00
Marc Chevrier 0bd2e3aa57 Merge topic 'pkg-config-linker-flags' 
b759fa9b8e FindPkgConfig: Set linker flags on imported targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3082
 2019-03-16 06:14:00 -04:00
Kitware Robot 49f606f3bb CMake Nightly Date Stamp 2019-03-16 00:01:09 -04:00
Mario Emmenlauer 90b7758489 FindBLAS: respect MKLROOT and MKL_ROOT if available 
Fixes: #19052
 2019-03-15 20:13:35 +01:00
Chuck Atkins c213e34d0c cray: Detect bad options passed on the command line 2019-03-15 11:38:19 -04:00