summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'unixtimefix'Brad King2018-02-272-4/+4
|\ | | | | | | | | | | | | e1cd936c Tests: Fix TIMESTAMP-UnixTime test under SOURCE_DATE_EPOCH=1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1800
| * Tests: Fix TIMESTAMP-UnixTime test under SOURCE_DATE_EPOCH=1Bernhard M. Wiedemann2018-02-262-4/+4
| | | | | | | | | | | | | | | | The test was expecting timestamps on day 1 in 1970 to start at 86400 but they actually started at 0. This worked without `SOURCE_DATE_EPOCH=1` because after 1972, leap days compensated the offset. Fixes: #17762
* | CMake Nightly Date StampKitware Robot2018-02-271-1/+1
| |
* | Merge topic 'extend_suppress_regeneration'Brad King2018-02-269-33/+80
|\ \ | | | | | | | | | | | | | | | | | | b6ef4bc3 Document and extend the CMAKE_SUPPRESS_REGENERATION variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1792
| * | Document and extend the CMAKE_SUPPRESS_REGENERATION variableShane Parris2018-02-239-33/+80
| | | | | | | | | | | | Fixes: https://gitlab.kitware.com/cmake/cmake/issues/16815
* | | Merge topic 'outputconverter_speedup'Brad King2018-02-262-36/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ab3660a cmOutputConverter: Inline some functions and avoid string re-allocations Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Pavel Solodovnikov <hellyeahdominate@gmail.com> Merge-request: !1788
| * | | cmOutputConverter: Inline some functions and avoid string re-allocationsFrank Winklmeier2018-02-232-36/+37
| |/ / | | | | | | | | | | | | | | | | | | Use std::string (with correct initial size) in cmOutputConverter::Shell__GetArgument instead of ostringstream. This avoids several re-allocations of the string buffer. In addition, convert some of the private static members into inline free functions to avoid function calls.
* | | Merge topic 'getsource_optimize'Brad King2018-02-262-0/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2d1e5ada cmMakefile: Improve performance of GetSource for known files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1764
| * | | cmMakefile: Improve performance of GetSource for known filesFrank Winklmeier2018-02-232-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Store "Known" files separately in KnownFileSearchIndex. This avoids creating the rather expensive cmSourceFileLocation object for source files that are already known. For large projects this results in a factor 3-4 speedup of cmGlobalGenerator::Compute().
* | | | Merge topic 'ipo-support'Brad King2018-02-261-0/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a18147e9 MSVC,Clang,Flang: Add IPO support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1721
| * | | | MSVC,Clang,Flang: Add IPO supportxoviat2018-02-231-0/+28
| | | | | | | | | | | | | | | | | | | | Fixes: #17692
* | | | | Merge topic 'project-references-csharp-17678'Brad King2018-02-269-18/+107
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 076a356c VS: Support C# project references Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1752
| * | | | | VS: Support C# project referencesRobert Dailey2018-02-239-18/+107
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When specifying a pure C# target in the `target_link_libraries()` call to another C++ target, a `<ProjectReference>` was setup for it (we wanted this) but also a corresponding `.lib` was added under `<AdditionalDependencies>` (we didn't want this). This change introduces a check that prevents `.lib` linker options from being used when the corresponding target for that library is a C# target. Fixes: #17678
* | | | | Merge topic 'vs-cpp-improvements'Brad King2018-02-264-82/+58
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b723fe3d VS: Convert loops to C++11, other C++ improvements Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1786
| * | | | | VS: Convert loops to C++11, other C++ improvementsVitaly Stakhovsky2018-02-224-82/+58
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-02-261-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-02-251-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-02-241-1/+1
| |/ / / / |/| | | |
* | | | | Merge branch 'release-3.11'Brad King2018-02-230-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch '14297-partial-xcode-zero-check' into release-3.11Brad King2018-02-235-1/+26
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1790
| * \ \ \ \ \ Merge branch 'std-thread-link' into release-3.11Brad King2018-02-222-0/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1789
* | \ \ \ \ \ \ Merge topic 'ninja-depfile-name'Brad King2018-02-231-2/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84de8b80 Ninja: Use as dependency file <objectDir/SourceName>.d if needed. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1781
| * | | | | | | | Ninja: Use as dependency file <objectDir/SourceName>.d if needed.Claus Klein2018-02-201-2/+20
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge topic '14297-partial-xcode-zero-check'Brad King2018-02-235-1/+26
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 481420ee Xcode: Generate ZERO_CHECK generator target only once Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1790
| * | | | | | | Xcode: Generate ZERO_CHECK generator target only onceGregor Jasny2018-02-225-1/+26
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY has been enabled generate only the root-level ZERO_CHECK target so targets in subdirectories pick up the root generator target of ZERO_CHECK. For the case that CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY is not enabled more investigation and a proper and final fix is still needed. Issue: 14297
* | | | | | | Merge topic 'std-thread-link'Brad King2018-02-232-0/+3
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 94eee5e6 CMakeLib: Link to system thread libraries to support std::thread Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Daniel Chabrowski <dantezstudio@gmail.com> Merge-request: !1789
| * | | | | | CMakeLib: Link to system thread libraries to support std::threadBrad King2018-02-222-0/+3
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some environments require linking to thread libraries for `std::thread`. Express this direct dependency of CMakeLib explicitly. Previously this was done indirectly through our bundled libuv, but that does not work when using a system libuv. Fixes: #17757
* | | | | | CMake Nightly Date StampKitware Robot2018-02-231-1/+1
| | | | | |
* | | | | | Merge topic 'fortran-compiler'Brad King2018-02-221-6/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 965f977c Fortran: Adjust compiler candidates based on host platform Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1780
| * | | | | | Fortran: Adjust compiler candidates based on host platformxoviat2018-02-211-6/+14
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Typical Fortran compiler command-line tool names differ on Windows and non-Windows platforms. Also, the name `ifc` should not be used on Windows because there is an `ifc.exe` tool in Visual Studio that is unrelated. Fixes: #17752
* | | | | | Merge topic 'setidentifier_move'Brad King2018-02-222-9/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 46436581 cmGeneratorExpression: Use std::move to avoid vector copies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1779
| * | | | | | cmGeneratorExpression: Use std::move to avoid vector copiesFrank Winklmeier2018-02-212-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use move semantics in GeneratorExpressionContent::SetIdentifier and ::SetParameters to avoid vector copies.
* | | | | | | Merge topic 'cmake-build-global-gen'Brad King2018-02-221-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 83f8e764 cmake: Fix global generator path style in --build mode Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1784
| * | | | | | | cmake: Fix global generator path style in --build modeBrad King2018-02-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the `--build` code path so that `cmSystemTools::SetForceUnixPaths` is called with the global generator's path style. This makes forwarding of `--target subdir/src.c.obj` match the slash style the generator placed in the build system. Fixes: #17742
* | | | | | | | Merge topic 'test-ExternalProject-serial'Brad King2018-02-221-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a55ad2c Tests: Run ExternalProject tests serially Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1783
| * | | | | | | | Tests: Run ExternalProject tests seriallyBrad King2018-02-211-0/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests use a lot of resources, so run them separately from other tests to avoid competition (which may cause spurious timeouts).
* | | | | | | | Merge branch 'release-3.11'Brad King2018-02-220-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'test-CompileFeatures-c11-range' into release-3.11Brad King2018-02-211-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1785
* | \ \ \ \ \ \ \ Merge topic 'test-CompileFeatures-c11-range'Brad King2018-02-221-1/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 972f7caa Tests: Make CompileFeatures C dialect check consistent with impl Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1785
| * | | | | | | Tests: Make CompileFeatures C dialect check consistent with implBrad King2018-02-211-1/+1
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Modules/CMakeCCompilerId.c.in` will report the C dialect as 11 whenever `__STDC_VERSION__` indicates *at least* C 11. Make the test consistent with this. We already do this for the C++ case. Fixes: #17740
* | | | | | | CMake Nightly Date StampKitware Robot2018-02-221-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'release-3.11'Brad King2018-02-210-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'autogen-depend-filters-documentation' into release-3.11Brad King2018-02-212-26/+99
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1782
* | \ \ \ \ \ Merge topic 'autogen-depend-filters-documentation'Brad King2018-02-212-26/+99
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bfffe42b Autogen: Doc: Extend AUTOMOC_DEPEND_FILTERS documentation 1cf7c54a Autogen: Doc: Extend AUTOGEN_TARGET_DEPENDS documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1782
| * | | | | | Autogen: Doc: Extend AUTOMOC_DEPEND_FILTERS documentationSebastian Holtermann2018-02-211-18/+77
| | | | | | |
| * | | | | | Autogen: Doc: Extend AUTOGEN_TARGET_DEPENDS documentationSebastian Holtermann2018-02-211-8/+22
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'FindLua-tolerate-var'Brad King2018-02-211-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6cced787 FindLua: Fix error when LUA_INCLUDE_PREFIX is set as a variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1778
| * | | | | | FindLua: Fix error when LUA_INCLUDE_PREFIX is set as a variableFrank Benkstein2018-02-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use `LUA_INCLUDE_PREFIX` for the result of an internal `find_path` call and unset the cache entry before each use. Unset a plain variable of this name too in case it was set by project code. Otherwise the `find_path` call may be skipped and the wrong value used, leading to errors.
* | | | | | | Merge topic 'FindwxWidget/fix-eating-minusL-in-path'Brad King2018-02-211-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67db3ff9 Fix eating "-L" in path names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1775
| * | | | | | | Fix eating "-L" in path namesRaffi Enficiaud2018-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the path containing the wxLibraries contains a "-L", a "string(REPLACE "-L" ...) replaces the content and results in a wrong path. The regex fixes this.