summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-12-151-0/+8
| | | | | * upstream-KWSys: KWSys 2017-12-15 (8f755ee9)
* Merge topic 'vs-vcxproj-lowercase-utf-8'Brad King2017-12-152-0/+6
|\ | | | | | | | | | | | | 907bc354 VS: Emit "utf-8" encoding as lowercase in .vcxproj headers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1594
| * VS: Emit "utf-8" encoding as lowercase in .vcxproj headersVitaly Stakhovsky2017-12-142-0/+6
| | | | | | | | Match the XML preamble generated by VS 2010 and later.
* | Merge topic 'makefile-simplify-fortran'Brad King2017-12-158-135/+22
|\ \ | | | | | | | | | | | | | | | | | | | | | 7ab9a625 Makefiles: Drop 'requires' step and its supporting infrastructure 5f2e2c38 Makefiles: Avoid nested make calls for Fortran module dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1523
| * | Makefiles: Drop 'requires' step and its supporting infrastructureYurii Batrak2017-12-147-126/+1
| | | | | | | | | | | | | | | | | | | | | | | | The 'requires' step was used to provide implicit dependencies between the generated Fortran module files and a Fortran target that needs these module files to ensure the correct compilation order. After recent refactoring to resolve all dependencies explicitly through `.mod.stamp` make targets, the separate 'requires' step is not needed anymore.
| * | Makefiles: Avoid nested make calls for Fortran module dependenciesYurii Batrak2017-12-143-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefiles generated by cmake use a series of nested calls to build `*.provides.build` targets that are used when the 'requires' step is needed. That leads to significant degradation of the build time for incremental builds. Re-arrange dependencies to eliminate the nested calls. Explicit `.mod.stamp` targets introduced by this commit could lead to situation when a stamp file always older than its dependency. This happens during the incremental build when building of an updated Fortran source produces a module file that has no differences from the stored stamp file. In such case `cmake_copy_f90_mod` will be triggered on each new build to compare a module file with the corresponding stamp file. This behavior is expected and can not be changed without nested calls that slow down the build. The copy-if-different check is much cheaper than an entire nested make call.
* | | CMake Nightly Date StampKitware Robot2017-12-151-1/+1
| | |
* | | Merge topic 'per-source-COMPILE_LANGUAGE-genex-support'Brad King2017-12-149-64/+151
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 10f58b27 Genex: Per-source $<COMPILE_LANGUAGE:...> support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1575
| * | | Genex: Per-source $<COMPILE_LANGUAGE:...> supportMarc Chevrier2017-12-139-64/+151
| | | | | | | | | | | | | | | | Fixes: #17542
* | | | Merge topic 'cmGraphVizWriter_Interface_Dependers'Brad King2017-12-142-15/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b4d31dc cmGraphVizWriter: Updated to create and follow dependers for interface targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1581
| * | | | cmGraphVizWriter: Updated to create and follow dependers for interface targetsJoel T. Frederico2017-12-142-15/+27
| | | | | | | | | | | | | | | | | | | | | | | | | Generating graphs of dependencies now uses interface targets, but graphs of dependers did not include interface targets.
| * | | | CMake 3.10.1v3.10.1Brad King2017-12-131-1/+1
| | | | |
| * | | | Merge branch 'automoc-apple-framework' into release-3.10Brad King2017-12-071-24/+23
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1561
| | * | | | Autogen: Fix for AUTOMOC on macOS frameworks in CMake 3.10Sebastian Holtermann2017-12-071-24/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert the library target dependency forwarding to the `_autogen` target to the 3.9.6 way, only now using `GetLinkImplementationLibraries`. Fixes: #17278
| * | | | | Merge branch 'backport-revert-server-target-backtraces' into release-3.10Brad King2017-12-062-54/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1564
* | | | | | | CMake Nightly Date StampKitware Robot2017-12-141-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge topic 'use-std-string'Brad King2017-12-135-21/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c62ffdcd cmIDEOptions: use std::string instead of const char* Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1580
| * | | | | | cmIDEOptions: use std::string instead of const char*Vitaly Stakhovsky2017-12-095-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise method signatures to save a few c_str() conversions.
* | | | | | | Merge topic 'update-kwsys'Brad King2017-12-132-4/+44
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 834d1878 Merge branch 'upstream-KWSys' into update-kwsys c6a83ecf KWSys 2017-12-12 (3ba214b7) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1587
| * | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-12-122-4/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-12-12 (3ba214b7)
* | | | | | | | CMake Nightly Date StampKitware Robot2017-12-131-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'fix-ctest-chrono'Brad King2017-12-1210-89/+42
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ba6caafa CTest: Use integer-representable value for "infinite" timeout 548e8f6f CTest: Simplify std::chrono::duration<double> conversion to double de0035fd cmCTestBuildAndTestHandler: Convert timeout to std::chrono::duration 687a26b7 CTest: Fix regression in build-and-test timeout forwarding e770b1b8 CTest: Fix regression in build-and-test timeout compuatation Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: dublet <github@dublet.org> Merge-request: !1574
| * | | | | | | CTest: Use integer-representable value for "infinite" timeoutBrad King2017-12-114-25/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 66419bc046 (CTest: convert timeouts to std::chrono::duration, 2017-11-20) changed out "infinite" timeout to a value not representable by a 64-bit integer. This causes undefined behavior when e.g. KWSys Process converts the duration to a `long` to interact with system APIs. Use the old `1.0e7` maximum value.
| * | | | | | | CTest: Simplify std::chrono::duration<double> conversion to doubleBrad King2017-12-086-52/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ratio of ticks to seconds for this type is 1, so we can just use its `count()` directly. This also avoids converting through the integer representation of `std::chrono::milliseconds`, which has a much smaller allowed range. Drop our `cmsysProcess_SetTimeout` wrapper as it is now very thin.
| * | | | | | | cmCTestBuildAndTestHandler: Convert timeout to std::chrono::durationBrad King2017-12-082-11/+11
| | | | | | | |
| * | | | | | | CTest: Fix regression in build-and-test timeout forwardingBrad King2017-12-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 66419bc046 (CTest: convert timeouts to std::chrono::duration, 2017-11-20) changed out "infinite" timeout to a value not representable by a 64-bit integer. Update the `--build-and-test` forwarding of `--test-timeout` to not forward an "infinite" timeout.
| * | | | | | | CTest: Fix regression in build-and-test timeout compuatationBrad King2017-12-081-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 66419bc046 (CTest: convert timeouts to std::chrono::duration, 2017-11-20) accidentally changed the logic used to compute the timeout for a test when it starts. It incorrectly limits the maximum possible timeout to 2 minutes rather than 2 minutes less than the total allowed test time remaining. Update the new logic to restore the original behavior. Avoid subtracting 2 minutes from our "infinite" timeout value to avoid creating very large timeouts that are not "infinite" and may exceed integer type ranges.
* | | | | | | | CMake Nightly Date StampKitware Robot2017-12-121-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'cpack-generator-scripts-enable-all-cmake-policies'Brad King2017-12-111-4/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 93d5f464 CPack: enable all CMake policies for generator scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1582
| * | | | | | | | CPack: enable all CMake policies for generator scriptsDomen Vrankar2017-12-091-4/+11
| | | | | | | | |
* | | | | | | | | Merge topic 'ctest-remove-unfinished-batch-mode'Brad King2017-12-117-170/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f984296b CTest: Remove unfinished batch test mode Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1577
| * | | | | | | | | CTest: Remove unfinished batch test modeBrad King2017-12-087-170/+1
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was partially implemented by commit v2.8.0~154 (Added some ctest batch capabilities, 2009-09-10) but never finished.
* | | | | | | | | Merge topic 'update-kwsys'Brad King2017-12-111-4/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9dee52ba Merge branch 'upstream-KWSys' into update-kwsys 3b1bb703 KWSys 2017-12-08 (2d27b1d0) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1576
| * | | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-12-081-4/+8
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-12-08 (2d27b1d0)
* | | | | | | | CMake Nightly Date StampKitware Robot2017-12-111-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2017-12-101-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-12-091-1/+1
|/ / / / / /
* | | | | | Merge topic 'autogen-fix-library-deps'Brad King2017-12-081-23/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1bc60334 Merge branch 'automoc-apple-framework' into autogen-fix-library-deps a3f8371c Merge branch 'automoc-apple-framework' into autogen-fix-library-deps bd49ae51 Autogen: Fix library dependency forwarding to _autogen target e4ccc684 Autogen: Tests: Add test for MacOS frameworks fcbd02fd Autogen: Fix for AUTOMOC on macOS frameworks in CMake 3.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1566
| * | | | | | Autogen: Fix library dependency forwarding to _autogen targetSebastian Holtermann2017-12-071-23/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Library dependencies of the origin target were forwarded to the _autogen target as source file dependencies. This is fixed by forwarding the dependencies as target dependencies instead. Issue: #17278
* | | | | | | Merge topic 'update-kwsys'Brad King2017-12-083-9/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c50f08cd Merge branch 'upstream-KWSys' into update-kwsys 5b1c84b4 KWSys 2017-12-07 (4aee0036) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1567
| * | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-12-073-9/+8
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-12-07 (4aee0036)
* | | | | | | CMake Nightly Date StampKitware Robot2017-12-081-1/+1
| | | | | | |
* | | | | | | Merge topic 'fix-ctest-chrono'Brad King2017-12-071-3/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be470278 CTest: Fix regression in test timeout compuatation Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: dublet <github@dublet.org> Merge-request: !1568
| * | | | | | CTest: Fix regression in test timeout compuatationBrad King2017-12-071-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 66419bc046 (CTest: convert timeouts to std::chrono::duration, 2017-11-20) accidentally changed the logic used to compute the timeout for a test when it starts. It incorrectly limits the maximum possible timeout to 2 minutes rather than 2 minutes less than the total allowed test time remaining. Update the new logic to restore the original behavior. Avoid subtracting 2 minutes from our "infinite" timeout value to avoid creating very large timeouts that are not "infinite" and may exceed integer type ranges.
* | | | | | | Merge topic 'splitRCPatchComponent'Brad King2017-12-072-4/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f92304c7 CMakeVersion RC file: Split patch into 2 components Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1552
| * | | | | | | CMakeVersion RC file: Split patch into 2 componentsJustin Goshi2017-12-042-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The binary file version has 4 16-bit components. In cases where the patch component is too large (ex: represents a build date yyyymmdd) we split it into two parts.
* | | | | | | | Merge topic 'revert-server-target-backtraces'Brad King2017-12-072-56/+0
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7100756 Merge branch 'backport-revert-server-target-backtraces' into revert-server-target-backtraces 976370d1 server: drop "ctestInfo" backtrace information 8b2736c7 server: Revert "Report backtraces in codemodel response" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1564
| * | | | | | | Merge branch 'backport-revert-server-target-backtraces' into ↵Brad King2017-12-062-53/+0
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | revert-server-target-backtraces
| | * | | | | | server: Revert "Report backtraces in codemodel response"Brad King2017-12-062-54/+0
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The backtrace information is very repetitive and hugely increases the size of the codemodel object. We need to remove it until an alternative representation can be developed. Revert commit v3.10.0-rc1~393^2 (server: Report backtraces in codemodel response, 2017-06-20), except for the protocol version number (because it indicates other new things). Unfortunately this is incompatible with clients that expect the "crossReferences" field in targets. However, the regression in memory usage is quite serious, especially on large projects, and therefore breaks even older clients that do not use backtraces. Since the "crossReferences" field was only provided by one release (3.10.0), it is simplest to revert it outright for 3.10.1. Fixes: #17502
| * | | | | | server: drop "ctestInfo" backtrace informationBrad King2017-12-061-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backtrace information was included by commit 35a52bd1b4 (server: add "ctestInfo" request to get test info, 2017-10-25) to match that already provided for targets. However, the backtrace representation uses too much memory and needs to be dropped. Remove it from test information. Issue: #17502