summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Rename cmFileTimeComparison to cmFileTimeCacheSebastian Holtermann2019-03-1811-41/+37
| | | | | The name `cmFileTimeCache` reflects the functionality of the class more appropriately.
* cmFileTimeComparison: Replace anonymous private class with std::mapSebastian Holtermann2019-03-182-54/+15
| | | | | | | 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.
* cmFileTimeComparison: Use cmFileTime internallySebastian Holtermann2019-03-183-184/+54
| | | | | | | | | 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.
* New cmFileTime classSebastian Holtermann2019-03-184-0/+184
| | | | | | 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.
* CMake Nightly Date StampKitware Robot2019-03-181-1/+1
|
* CMake Nightly Date StampKitware Robot2019-03-171-1/+1
|
* Merge topic 'pkg-config-linker-flags'Marc Chevrier2019-03-163-1/+31
|\ | | | | | | | | | | | | b759fa9b8e FindPkgConfig: Set linker flags on imported targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3082
| * FindPkgConfig: Set linker flags on imported targetsRadek Nadstawny2019-03-133-1/+31
| |
* | CMake Nightly Date StampKitware Robot2019-03-161-1/+1
| |
* | Merge topic 'export-package-default-off'Brad King2019-03-1511-14/+117
|\ \ | | | | | | | | | | | | | | | | | | | | | 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
| * | export: Disable PACKAGE mode user package registry by defaultRobert Maynard2019-03-1511-14/+117
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge topic 'ninja-dyndep-touchups'Brad King2019-03-152-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | cmNinjaTargetGenerator: use a different depfile for preprocessingBen Boeckel2019-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | If the compile rule also needs a depfile, the names now no longer collide.
| * | | cmake_ninja_dyndep: don't duplicate slashesBen Boeckel2019-03-121-1/+1
| | | |
* | | | Merge branch 'release-3.14'Brad King2019-03-150-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'find_program-windows-share' into release-3.14Brad King2019-03-141-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3105
| * \ \ \ \ Merge branch 'FindPython-ensure-correct-architecture-selected' into release-3.14Brad King2019-03-144-8/+29
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3103
| * \ \ \ \ \ Merge branch 'vs2019-wow64' into release-3.14Brad King2019-03-141-5/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3102
* | \ \ \ \ \ \ Merge topic 'find_program-windows-share'Brad King2019-03-151-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00c4ddf75e find_program: Restore leading double slash on Windows network path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3105
| * | | | | | | find_program: Restore leading double slash on Windows network pathBrad King2019-03-141-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge topic 'FindPython-ensure-correct-architecture-selected'Brad King2019-03-154-8/+29
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a84cb1663 FindPython*: ensure correct architecture is selected. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3103
| * | | | | | FindPython*: ensure correct architecture is selected.Marc Chevrier2019-03-144-8/+29
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure interpreter and libraries architecture matches CMake build configuration. Update documentation about interpreter constraints. Fixes: #19024
* | | | | | Merge topic 'vs2019-wow64'Brad King2019-03-151-5/+10
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c50eeaffc VS: Fix x64 host recognition by x86 cmake process Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3102
| * | | | | VS: Fix x64 host recognition by x86 cmake processBrad King2019-03-141-5/+10
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 57e48f16f2 (VS: Add Visual Studio 16 2019 generator, 2019-01-09, v3.14.0-rc1~150^2) and commit 0fd742a6ff (VS: Teach VS 2019 generator to select host tools matching host arch, 2019-01-28, v3.14.0-rc1~63^2) we intended to select the `x64` target architecture and `x64` host tools by default on x64 host machines. Fix detection of a x64 host when CMake itself is a 32-bit x86 process. The KWSys SystemInformation `Is64Bits` member is not set correctly, which led to this bug. Pending investigation on the KWSys side, simply test ourselves via `IsWow64Process`.
* | | | | Merge topic 'test-FindGTK2-explicit'Brad King2019-03-152-7/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Tests: Run FindGTK2 tests only when explicitly enabledBrad King2019-03-142-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not `find_package(GTK2)` by default, as it gives the impression that CMake depends on it to build. We will set `CMake_TEST_FindGTK2` in the cache of automated builds where GTK2 is expected to work.
* | | | | | Merge topic 'cmake-gui-unused-code'Brad King2019-03-151-3/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dd8c2f3e57 cmake-gui: Drop code not needed with current required CMake version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3099
| * | | | | | cmake-gui: Drop code not needed with current required CMake versionBrad King2019-03-141-3/+0
| |/ / / / /
* | | | | | CMake Nightly Date StampKitware Robot2019-03-151-1/+1
|/ / / / /
* | | | | Merge topic 'refactor_cmfilecopier'Brad King2019-03-147-1080/+1193
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e2e8f6b132 cmFileCommand: Factor out cmFileCopier and cmFileInstaller Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2664
| * | | | | cmFileCommand: Factor out cmFileCopier and cmFileInstallerBryon Bean2019-03-137-1080/+1193
| | | | | | | | | | | | | | | | | | | | | | | | Split these classes out into their own sources.
* | | | | | Merge topic 'string_scopes'Brad King2019-03-144-68/+56
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3039fd7a29 cmDependsC: Use faster cmSystemTools::FileTimeCompare b96c3c74dd cmDependsC: Use auto for long type names e81b425019 cmDependsC: Remove useless string preallocation artifact d1a54ee26a cmDepends: Reduce temporary object lifetime with local scopes ae416a6b5c cmLocalUnixMakefileGenerator3: Use std::unique_ptr instead of new/delete 60a407b01c cmLocalUnixMakefileGenerator3: Pass strings instead of recomputing them addd1ce402 cmLocalUnixMakefileGenerator3: Move local strings into local brace scopes Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !3088
| * | | | | | cmDependsC: Use faster cmSystemTools::FileTimeCompareSebastian Holtermann2019-03-131-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file stat caching feature of the local cmFileTimeComparison instance is unused in the addressed context. To avoid the allocation and initialization overhead of cmFileTimeComparison use cmSystemTools::FileTimeCompare instead.
| * | | | | | cmDependsC: Use auto for long type namesSebastian Holtermann2019-03-121-3/+2
| | | | | | |
| * | | | | | cmDependsC: Remove useless string preallocation artifactSebastian Holtermann2019-03-121-13/+6
| | | | | | |
| * | | | | | cmDepends: Reduce temporary object lifetime with local scopesSebastian Holtermann2019-03-121-17/+17
| | | | | | |
| * | | | | | cmLocalUnixMakefileGenerator3: Use std::unique_ptr instead of new/deleteSebastian Holtermann2019-03-121-10/+6
| | | | | | |
| * | | | | | cmLocalUnixMakefileGenerator3: Pass strings instead of recomputing themSebastian Holtermann2019-03-122-14/+12
| | | | | | |
| * | | | | | cmLocalUnixMakefileGenerator3: Move local strings into local brace scopesSebastian Holtermann2019-03-121-8/+11
| | | | | | |
* | | | | | | Merge topic 'import-zstd'Brad King2019-03-1471-10/+31230
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1761a9a546 CMake: Enable use of zstd in libarchive 2cf2921749 zstd: Add CMake build system f92b4b52eb Merge branch 'upstream-zstd' into import-zstd fbaf65639a zstd 2018-12-27 (470344d3) 9337cbfcca zstd: add script to import zstd from upstream Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Bartosz <gang65@poczta.onet.pl> Merge-request: !3092
| * | | | | | | CMake: Enable use of zstd in libarchiveBrad King2019-03-138-10/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build zstd as part of CMake or find one on the system. Modify our port of libarchive to use the zstd configured for use with CMake. Issue: #18657
| * | | | | | | zstd: Add CMake build systemBrad King2019-03-131-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although the upstream has a CMake build system, it is meant for the complete package. Add a simple one to build just the static library we need within CMake.
| * | | | | | | Merge branch 'upstream-zstd' into import-zstdBrad King2019-03-1361-0/+31112
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-zstd: zstd 2018-12-27 (470344d3)
| | * | | | | | | zstd 2018-12-27 (470344d3)zstd upstream2019-03-1361-0/+31112
| | / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/facebook/zstd.git at commit 470344d33e1d52a2ada75d278466da8d4ee2faf6 (v1.3.8).
| * | | | | | | zstd: add script to import zstd from upstreamBrad King2019-03-131-0/+36
| | | | | | | |
* | | | | | | | Merge topic 'xcodescheme'Brad King2019-03-145-0/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 40be48f890 XCode: Add scheme option XCODE_SCHEME_DEBUG_AS_ROOT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3084
| * | | | | | | | XCode: Add scheme option XCODE_SCHEME_DEBUG_AS_ROOTHarry Mallon2019-03-115-0/+15
| | | | | | | | |
* | | | | | | | | Merge topic 'short-commands'Brad King2019-03-144-11/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 077ab5774c cmake: add short version of '--target <tgt>...' option 071f5e1544 cmake: Reformat '--parallel' and '--verbose' options in help Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3078
| * | | | | | | | | cmake: add short version of '--target <tgt>...' optionBartosz Kosiorek2019-03-124-5/+13
| | | | | | | | | |
| * | | | | | | | | cmake: Reformat '--parallel' and '--verbose' options in helpBartosz Kosiorek2019-03-122-7/+7
| | | | | | | | | |