Commit Graph

42835 Commits

Author SHA1 Message Date
Harry Mallon 413b71485a Xcode: Create Xcode schemes per target 2019-03-21 16:50:41 +00: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
Ben Boeckel 53184a727d cm_utf8: add an is_valid function 2019-03-18 14:18:13 -04: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
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
Claudio Fantacci a77a30e657 FindGLEW: Add test 2019-03-15 11:22:32 -04:00
Claudio Fantacci a7d853868b FindGLEW: Update implementation
Replicate behaviour of upstream GLEW.

* define the imported target GLEW::glew for the shared library GLEW

* if GLEW_USE_STATIC_LIBS is defined and set to TRUE, this module instead
  defines the imported target GLEW::glew_s for the static library GLEW

* an imported target GLEW::GLEW is created as a copy of either GLEW::glew
  or GLEW::glew_s

* by setting GLEW_VERBOSE you print out the log of the module.

Fixes: #17638, #17864, #18989
2019-03-15 11:22:29 -04:00
Robert Maynard 380b2dae55 Add a release note for the cuda compiler generator expressions 2019-03-15 11:04:25 -04:00
Bartosz Kosiorek c58f5e116e ExternalProject: Extend documentation about GIT_TAG usage
When GIT_SHALLOW is used, the '--depth 1 --no-single-branch'
arguments are add. It means that only branch names and tags
is downloaded to repository. Most Commit Hash is not working.
With this commit the documentation was updated, to describe
the limitation of GIT_SHALLOW.
2019-03-15 11:00:31 -04:00
Brad King 3261f23870 Merge topic 'export-package-default-off'
9bede5c4ce export: Disable PACKAGE mode user package registry by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Lukas Mosimann <lumosimann@gmail.com>
Merge-request: !3041
2019-03-15 10:45:51 -04:00
Brad King a6d8165dd2 Merge topic 'ninja-dyndep-touchups'
76e6e01c6c cmNinjaTargetGenerator: use a different depfile for preprocessing
414332ff57 cmake_ninja_dyndep: don't duplicate slashes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3093
2019-03-15 10:27:55 -04:00
Brad King 5940d18e49 Merge branch 'release-3.14' 2019-03-15 10:27:06 -04:00
Robert Maynard 9bede5c4ce export: Disable PACKAGE mode user package registry by default
The user package registry populated by the `export()` command causes
side effects outside the build and source directories.  Such effects
should be opt-in rather than op-out.  Introduce a policy to change
default behavior of `export(PACKAGE)` to do nothing.
2019-03-15 10:24:47 -04:00
Brad King 0db702c702 Merge topic 'find_program-windows-share'
00c4ddf75e find_program: Restore leading double slash on Windows network path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3105
2019-03-15 10:21:35 -04:00
Brad King f739654ddf Merge topic 'FindPython-ensure-correct-architecture-selected'
9a84cb1663 FindPython*: ensure correct architecture is selected.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3103
2019-03-15 10:20:28 -04:00
Brad King 7d77607d10 Merge topic 'vs2019-wow64'
5c50eeaffc VS: Fix x64 host recognition by x86 cmake process

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3102
2019-03-15 10:19:01 -04:00
Brad King 41d796c09b Merge topic 'test-FindGTK2-explicit'
28ae243ca6 Tests: Run FindGTK2 tests only when explicitly enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !3100
2019-03-15 10:16:06 -04:00
Brad King 164261910d Merge topic 'cmake-gui-unused-code'
dd8c2f3e57 cmake-gui: Drop code not needed with current required CMake version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3099
2019-03-15 10:14:52 -04:00
Brad King 80af3ddea7 zstd: Disable BMI2 instructions for build within CMake
Our nightly and release binaries build in an environment that does not
support these instructions.  Disable them everywhere for simplicity
because CMake's application of this library is not performance-critical.
2019-03-15 10:05:23 -04:00
Kitware Robot 2efecea485 CMake Nightly Date Stamp 2019-03-15 00:01:07 -04:00
Brad King 5b6c6c2d80 Merge branch 'find_program-windows-share' into release-3.14
Merge-request: !3105
2019-03-14 14:52:12 -04:00
Brad King 00c4ddf75e find_program: Restore leading double slash on Windows network path
Since commit c76c1ea208 (find_program: Consider CWD only for paths with
separator, 2018-05-31, v3.13.0-rc1~413^2) we accidentally convert the
leading `//` to just `/` on results with Windows network paths.

This was caused by `CollapseCombinedPath` being less robust than
`CollapseFullPath`.  Restore use of the latter but in a way that
preserves the requirement of the above commit to support candidates that
are themselves absolute.

Fixes: #19049
Issue: #19050
2019-03-14 14:46:23 -04:00