summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* server: return whether or not a target is generator providedJustin Goshi2017-11-2013-33/+55
| | | | | | Some generators auto-generate targets. For example VS generators create the ALL_BUILD target. Add the ability to mark targets as generator provided and return that info through cmake-server codemodel.
* Merge topic 'tidy-sha1-comment'Brad King2017-11-201-1/+6
|\ | | | | | | | | | | | | 08353542 clang-tidy: Clarify comment explaining purpose of CLANG_TIDY_SHA1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1497
| * clang-tidy: Clarify comment explaining purpose of CLANG_TIDY_SHA1Brad King2017-11-171-1/+6
| | | | | | | | Suggested-by: Bill Hoffman <bill.hoffman@kitware.com>
* | Merge branch 'release-3.10'Brad King2017-11-200-0/+0
|\ \
| * | CMake 3.10.0v3.10.0Brad King2017-11-201-1/+1
| | |
* | | Merge branch 'release-3.10'Brad King2017-11-200-0/+0
|\ \ \ | |/ /
| * | Merge branch 'fix-cmake-server-bad-buffering' into release-3.10Brad King2017-11-201-3/+2
| |\ \ | | | | | | | | | | | | Merge-request: !1498
* | \ \ Merge topic 'fix-cmake-server-bad-buffering'Brad King2017-11-201-3/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 01c42155 server: Fix regression in partial message handling Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: jdavidberger <j.david.berger@gmail.com> Merge-request: !1498
| * | | server: Fix regression in partial message handlingvector-of-bool2017-11-201-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a partial message is flushed into the input pipe for CMake Server, the parser will try and parse it as a full message because of some bad loop checks. This was introduced accidentally in commit v3.10.0-rc1~365^2~2 (server: Refactor to make the event loop owned by server object, 2017-03-24).
* | | | Merge topic 'autogen-rcc-custom-command'Brad King2017-11-2017-1665/+2015
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 40434631 Autogen: Use integers instead of strings for the Qt version be11a852 Autogen: Use project relative paths in rcc custom command comment ab9d5896 Autogen: Detect rcc feature once during configuration 2a85b5ac Autogen: Make cmQtAutoGeneratorInitializer an instantiable class 75819b86 Autogen: Add and use cmQtAutoGenerator base class 27ed3b35 Autogen: Rename cmQtAutoGenerators to cmQtAutoGeneratorMocUic 1cd285fe Autogen: Remove rcc code from cmQtAutoGenerators a87f82e0 Autogen: Switch to use custom commands for RCC ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1494
| * | | | Autogen: Use integers instead of strings for the Qt versionSebastian Holtermann2017-11-194-17/+9
| | | | |
| * | | | Autogen: Use project relative paths in rcc custom command commentSebastian Holtermann2017-11-191-1/+21
| | | | |
| * | | | Autogen: Detect rcc feature once during configurationSebastian Holtermann2017-11-197-103/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to detect the `rcc` features before every `rcc` list invocation wich resulted in `rcc` be called twice for every listing operation. Now we detect the `rcc` list capabilities once during configuration and pass it to the cmake_autorcc target in the info file.
| * | | | Autogen: Make cmQtAutoGeneratorInitializer an instantiable classSebastian Holtermann2017-11-198-759/+713
| | | | | | | | | | | | | | | | | | | | | | | | | Remove the cmQtAutoGenDigest classes and make cmQtAutoGeneratorInitializer instantiable instead.
| * | | | Autogen: Add and use cmQtAutoGenerator base classSebastian Holtermann2017-11-199-759/+488
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the new base class `cmQtAutoGenerator` which contains common variables and methods used by `cmQtAutoGeneratorMocUic` and `cmQtAutoGeneratorRcc`.
| * | | | Autogen: Rename cmQtAutoGenerators to cmQtAutoGeneratorMocUicSebastian Holtermann2017-11-194-76/+76
| | | | |
| * | | | Autogen: Remove rcc code from cmQtAutoGeneratorsSebastian Holtermann2017-11-193-314/+1
| | | | |
| * | | | Autogen: Switch to use custom commands for RCCSebastian Holtermann2017-11-193-209/+331
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of processing all `rcc` invocation requests in the _autogen target that calls `cmake -E cmake_autogen ...` once, use a dedicated custom command that calls `cmake -E cmake_autorcc ...` for each `.qrc` file. This allows parallel `.qrc` file processing and reduces the workload (and complexity) in the _autogen target. If only `AUTORCC` is enabled, the _autogen target won't be created at all since it is now used for `AUTOMOC` and `AUTOUIC` only. For `.qrc` files that are GENERATED a custom target is used instead of a custom command. Closes #17161
| * | | | Autogen: Introduce standalone RCC generator classSebastian Holtermann2017-11-194-4/+844
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces the standalone RCC generator class `cmQtAutoGeneratorRcc`. Every instance of `cmQtAutoGeneratorRcc` class handles the `rcc` invocation for a single `.qrc` file. The class will be used in the future to allow parallel `.qrc` file processing by calling `cmake -E cmake_autorcc <INFO_FILE> <CONFIG>`.
* | | | | Merge topic 'cpack-minor-cleanup-and-tests-extension'Brad King2017-11-2033-68/+152
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 325f34d1 CPack tests: add possibility for expecting config developer warnings 176281e1 CPack test: correctly handle CPACK_PACKAGING_INSTALL_PREFIX cf0c2599 CPack: set variable commands in lower case 2ff906b3 CPack: documentation typo fix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1499
| * | | | | CPack tests: add possibility for expecting config developer warningsDomen Vrankar2017-11-192-1/+28
| | | | | |
| * | | | | CPack test: correctly handle CPACK_PACKAGING_INSTALL_PREFIXDomen Vrankar2017-11-1930-65/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every CPack generator sets default CPACK_PACKAGING_INSTALL_PREFIX variable value differently so test framework should support that correctly - previous version expected RPM/Deb /usr default and removed it for Archive packagers as the default there is /.
| * | | | | CPack: set variable commands in lower caseDomen Vrankar2017-11-191-1/+1
| | | | | |
| * | | | | CPack: documentation typo fixDomen Vrankar2017-11-191-1/+1
| |/ / / /
* | | | | Merge topic 'ctest-chrono'Brad King2017-11-2010-33/+44
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5fd979a8 CTest: adopt std::chrono::system_clock Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1487
| * | | | | CTest: adopt std::chrono::system_clockWouter Klouwen2017-11-1710-33/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the refactor to make CTest use std::chrono::steady_clock for the keeping of time for test duration, there are still references to cmSystemTools::GetTime() left. To further adopt std::chrono for time related activities, this commit changes those remaining references to std::chrono::system_clock::now() calls and alters the storage from either unsigned int or double to std::chrono::system_clock::time_point. For ease of conversion, a converter method is added to cmXMLWriter that converts from a std::chrono::system_clock::time_point to the number of seconds since the UN*X epoch as that is expected behaviour. This means no more casts as required. Functionally should be no difference as the system_clock is implemented in the same terms.
* | | | | | Merge topic 'cuda-sep-comp-var'Brad King2017-11-206-0/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00e13993 CUDA: Add CMAKE_CUDA_SEPARABLE_COMPILATION variable Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alexander Korsunsky <a.korsunsky@gmail.com> Merge-request: !1495
| * | | | | | CUDA: Add CMAKE_CUDA_SEPARABLE_COMPILATION variableBrad King2017-11-176-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use its value to initialize the `CUDA_SEPARABLE_COMPILATION` target property when targets are created. Fixes: #17478
* | | | | | | Merge topic 'iwyu-suppress-clang-warnings'Brad King2017-11-201-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be592b23 IWYU: Suppress warnings from the internal Clang Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1496
| * | | | | | | IWYU: Suppress warnings from the internal ClangBrad King2017-11-171-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not obscure IWYU's report with warnings from its internal Clang. We have other testing for such warnings. Also, when compiling with a non-Clang compiler we might use warning options that IWYU's Clang does not understand, and we don't want to see warnings about that.
* | | | | | | Merge topic 'perf-source-lookup'Brad King2017-11-208-40/+84
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a6348db Performance: Improve efficiency of source file lookup in cmMakefile Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1421
| * | | | | | | Performance: Improve efficiency of source file lookup in cmMakefileAaron Orenstein2017-11-178-40/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reintroduces the change from commit v3.10.0-rc1~69^2 (Performance: Improve efficiency of source file lookup in cmMakefile, 2017-08-17) with some corrections. The original was rolled back by commit v3.10.0-rc1~52^2~1 (Revert "Performance: ...", 2017-09-25) due to incompatibilities found. The rollback was followed-up by addition of a test for the offending case, and this revision passes the test.
* | | | | | | | Merge topic 'FindOpenGL-glvnd-policy'Brad King2017-11-2017-6/+135
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2ea17412 FindOpenGL: Add policy CMP0072 to prefer GLVND for legacy GL Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Clinton Stimpson <clinton@elemtech.com> Merge-request: !1491
| * | | | | | | | FindOpenGL: Add policy CMP0072 to prefer GLVND for legacy GLBrad King2017-11-1717-6/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17449
* | | | | | | | | Merge topic 'serverBugFixHasInstallRule'Brad King2017-11-201-1/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb7d0a80 server: project has install rule bug fix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1489
| * | | | | | | | | server: project has install rule bug fixJustin Goshi2017-11-161-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to check all generators associated with the project because any of them may have an install rule.
* | | | | | | | | | Merge topic 'vs-source-group-order'Brad King2017-11-207-21/+25
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f26009dd VS: Order .vcxproj.filters files deterministically c871446a cmSourceGroup: Return strings from GetName and GetFullName Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1484
| * | | | | | | | | | VS: Order .vcxproj.filters files deterministicallyBrad King2017-11-151-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort source groups by name rather than arbitrary pointer values. Fixes: #17446
| * | | | | | | | | | cmSourceGroup: Return strings from GetName and GetFullNameBrad King2017-11-157-18/+19
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'compile_flags_xref_fix'Craig Scott2017-11-201-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87a0b54a Help: Fix cross-reference in COMPILE_FLAGS target property docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1500
| * | | | | | | | | | Help: Fix cross-reference in COMPILE_FLAGS target property docsCraig Scott2017-11-191-1/+1
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2017-11-201-1/+1
| |_|_|_|_|_|/ / / / |/| | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2017-11-191-1/+1
|/ / / / / / / / /
* | | | | | | | | CMake Nightly Date StampKitware Robot2017-11-181-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge topic 'blas-lapack-flame'Brad King2017-11-173-0/+35
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f5bc7826 Find{BLAS,LAPACK}: Add support for FLAME blis and libflame Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1486
| * | | | | | | | Find{BLAS,LAPACK}: Add support for FLAME blis and libflameJ M Dieterich2017-11-163-0/+35
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FLAME (github.com/flame) provides a variety of numerical libraries. `blis` and `libflame` can be setup to expose BLAS/LAPACK interfaces. Fixes: #17470
* | | | | | | | Merge topic 'FindRuby-through-2.4'Brad King2017-11-171-3/+21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd2cdfe2 FindRuby: Add support for versions 2.2, 2.3, and 2.4 23ab451a FindRuby: Fix match of '.' in version numbers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1493
| * | | | | | | | FindRuby: Add support for versions 2.2, 2.3, and 2.4Brad King2017-11-161-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Author: J. Peter Mugaas (jpmugaas on gitlab.kitware.com) Fixes: #17475
| * | | | | | | | FindRuby: Fix match of '.' in version numbersBrad King2017-11-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Escape `.` so that it is matched literally and not treated as a special match of any character by the regex.
* | | | | | | | | Merge topic 'test-bad-foreach-in-function'Brad King2017-11-176-0/+18
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb114a40 Tests: Add test for bad foreach inside a function Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1492