summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2018-11-201-1/+1
|
* Merge branch 'release-3.13'Brad King2018-11-190-0/+0
|\
| * Merge branch 'backport-configure_file-canonical-deps' into release-3.13Brad King2018-11-195-11/+18
| |\ | | | | | | | | | Merge-request: !2635
| * \ Merge branch 'ctest-stdin' into release-3.13Brad King2018-11-157-2/+45
| |\ \ | | | | | | | | | | | | Merge-request: !2618
* | \ \ Merge topic 'backport-configure_file-canonical-deps'Brad King2018-11-190-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 57701227d6 configure_file: canonicalize input and output path in dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2635
| * | | configure_file: canonicalize input and output path in dependenciesFrank Benkstein2018-11-195-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Represent the input file path internally in canonical form. Otherwise multiple `configure_file` calls that share the same input file but specify it relative to different directories (e.g. via `../`) result in multiple copies of the dependency on the rule to re-run CMake. This causes the Ninja generator to emit duplicate phony build statements for these dependencies, which generates an error with `-w dupbuild=err`, which will be default in Ninja 1.9. Also canonicalize the output path for consistency. Add a test case. Fixes: #18584
* | | | Merge topic 'macro_doc_cleanups'Brad King2018-11-191-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b82526c654 Help: Minor grammar and typo corrections for macro command docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2622
| * | | | Help: Minor grammar and typo corrections for macro command docsCraig Scott2018-11-151-5/+5
| | | | | | | | | | | | | | | Follow-up to !2616, specifically commit 22cca9b810
* | | | | Merge topic 'findx11-imported-targets'Brad King2018-11-196-121/+887
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bced9d5e56 Tests/FindX11: add a test a7d2ffb232 FindX11: add imported targets 40b3dba529 FindX11: require Freetype and Fontconfig for Xft cc96249e2e FindX11: remove local variable from the advanced list 99489d9f10 FindX11: find Xext.h b8b598061a FindX11: match variables with library names 6079a0d00f FindX11: fix some formatting in the documentation 3c54955d0d FindX11: use `list(APPEND)` for clearer code ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2604
| * | | | | Tests/FindX11: add a testBen Boeckel2018-11-154-0/+508
| | | | | |
| * | | | | FindX11: add imported targetsBen Boeckel2018-11-132-36/+244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These imported targets are fine-grained and recommended over the global `X11_LIBRARIES` and `X11_INCLUDE_DIR` variables.
| * | | | | FindX11: require Freetype and Fontconfig for XftBen Boeckel2018-11-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Xft header includes headers from freetype and fontconfig, so they are necessary for its use.
| * | | | | FindX11: remove local variable from the advanced listBen Boeckel2018-11-121-1/+0
| | | | | |
| * | | | | FindX11: find Xext.hBen Boeckel2018-11-122-1/+5
| | | | | |
| * | | | | FindX11: match variables with library namesBen Boeckel2018-11-122-41/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This deprecates various variables, but provides them for backwards compatibility.
| * | | | | FindX11: fix some formatting in the documentationBen Boeckel2018-11-121-2/+2
| | | | | |
| * | | | | FindX11: use `list(APPEND)` for clearer codeBen Boeckel2018-11-121-39/+39
| | | | | |
| * | | | | FindX11: use lowercase function namesBen Boeckel2018-11-121-14/+14
| | | | | |
* | | | | | Merge topic 'pie-link-options'Brad King2018-11-192-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b10f7ac534 CMP0083: fix warning message on try_compile Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2619
| * | | | | | CMP0083: fix warning message on try_compileMarc Chevrier2018-11-192-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18593
* | | | | | | Merge topic 'ctest-stdin'Brad King2018-11-197-2/+45
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 86e8315482 CTest: Restore inheritance of stdin by test processes bdec3bd896 Tests: Teach RunCMake infrastructure to optionally provide stdin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2618
| * | | | | | CTest: Restore inheritance of stdin by test processesBrad King2018-11-156-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.11.0-rc1~117^2 (CTest: Re-implement test process handling using libuv, 2017-12-10) we do not give the child test processes any stdin. Prior to that change we let the child test processes inherit stdin from ctest itself. Tests that run serially might be able to use the real stdin meaningfully, so restore that behavior and add a test case. Fixes: #18591
| * | | | | | Tests: Teach RunCMake infrastructure to optionally provide stdinBrad King2018-11-151-0/+9
| | |_|_|/ / | |/| | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-11-191-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-11-181-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-11-171-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-11-161-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'cpack'Brad King2018-11-152-23/+44
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a26ac919ef Help: Explain interaction of cpack(1) and CPack. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2617
| * | | | | Help: Explain interaction of cpack(1) and CPack.Joachim Wuttke (l)2018-11-152-23/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, make clear that package/installer generators are not the makefile generators of the cmake command. Also insert sections in CPack doc, and capitalize section titles.
* | | | | | Merge topic 'test-WriteBasicConfigVersionFile'Brad King2018-11-155-906/+891
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f3a381115f Tests: Simplify RunCMake.WriteBasicConfigVersionFile 0dbcc1afbf Tests: Factor out RunCMake.WriteBasicConfigVersionFile test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2612
| * | | | | | Tests: Simplify RunCMake.WriteBasicConfigVersionFileBrad King2018-11-142-29/+8
| | | | | | |
| * | | | | | Tests: Factor out RunCMake.WriteBasicConfigVersionFile testBrad King2018-11-146-906/+912
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `WriteBasicConfigVersionFile` section of the `FindPackageTest` is independent of the rest.
* | | | | | | Merge topic 'configure_file-canonical-deps'Brad King2018-11-155-11/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6199637e95 configure_file: canonicalize input and output path in dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2586
| * | | | | | | configure_file: canonicalize input and output path in dependenciesFrank Benkstein2018-11-135-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Represent the input file path internally in canonical form. Otherwise multiple `configure_file` calls that share the same input file but specify it relative to different directories (e.g. via `../`) result in multiple copies of the dependency on the rule to re-run CMake. This causes the Ninja generator to emit duplicate phony build statements for these dependencies, which generates an error with `-w dupbuild=err`, which will be default in Ninja 1.9. Also canonicalize the output path for consistency. Add a test case. Fixes: #18584
* | | | | | | | Merge topic 'deprecate-findqt'Brad King2018-11-1516-5/+141
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f5c1b404b find_package(): Add policy to remove the FindQt module Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: noo mook <noomook2519@gmail.com> Merge-request: !2554
| * | | | | | | find_package(): Add policy to remove the FindQt moduleKyle Edwards2018-11-1416-5/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing FindQt.cmake gives Qt upstream a path forward to export its own QtConfig.cmake files which can be found by find_package() without having to explicitly specify CONFIG. Projects that still want to use Qt3/4 can call find_package(Qt[34]), include(FindQt), or add FindQt.cmake to their CMAKE_MODULE_PATH.
* | | | | | | | Merge topic 'autogen_info_write'Brad King2018-11-157-184/+271
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e0c26406aa Autogen: Sort tests 83bbfb1d53 Autogen: Add a definitions test to the MocOnly test 01d5e5c460 Autogen: Add and use cmQtAutoGenInitializer::InfoWriter class Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2610
| * | | | | | | | Autogen: Sort testsSebastian Holtermann2018-11-143-38/+32
| | | | | | | | |
| * | | | | | | | Autogen: Add a definitions test to the MocOnly testSebastian Holtermann2018-11-142-1/+7
| | | | | | | | |
| * | | | | | | | Autogen: Add and use cmQtAutoGenInitializer::InfoWriter classSebastian Holtermann2018-11-142-145/+232
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new ``cmQtAutoGenInitializer::InfoWriter`` class provides an interface to write strings/vectors/sets/maps in CMake format into a file. Its use replaces various `cmJoin` calls that failed to address escaping of semicolons in list elements. Closes #18554
* | | | | | | | Merge topic 'test-XcodeProject-timeout'Brad King2018-11-151-0/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca355d92d8 Tests: Add option for custom RunCMake.XcodeProject timeout Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2614
| * | | | | | | | Tests: Add option for custom RunCMake.XcodeProject timeoutBrad King2018-11-141-0/+7
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | The test has many cases and can take a long time on busy machines.
* | | | | | | | Merge topic 'doc-developer-to-source-guide'Brad King2018-11-154-584/+552
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a82282a08c Help/dev: Factor out a CMake Documentation Guide for developing the docs bfbc5241e9 Help: Fix policy markup example in cmake-developer(7) 3e5a047f1a Help: Drop compile features section from cmake-developer(7) manual 06cc050c1f Help/dev: Drop 'size_t' preference from source code guide Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2615
| * | | | | | | | Help/dev: Factor out a CMake Documentation Guide for developing the docsBrad King2018-11-144-530/+552
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove this content from the `cmake-developer(7)` manual because it is relevant only to developers working on CMake itself. Move it to a guide in the developer documentation.
| * | | | | | | | Help: Fix policy markup example in cmake-developer(7)Brad King2018-11-141-1/+1
| | | | | | | | |
| * | | | | | | | Help: Drop compile features section from cmake-developer(7) manualBrad King2018-11-141-47/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We no longer add granular compile features. Only language standard meta features like `cxx_std_##`` need to be added, and these can be done by following existing patterns.
| * | | | | | | | Help/dev: Drop 'size_t' preference from source code guideBrad King2018-11-141-7/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now use `std::size_t` in several places and it is fully supported by C++11 compilers. Drop the recommendation to prefer plain `size_t`.
* | | | | | | | Merge topic 'macro3'Brad King2018-11-152-15/+43
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 22cca9b810 Help: describe differences between macro and function. b90ae70a3b Help: in macro vs function example, use lowercase names. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2616
| * | | | | | | | Help: describe differences between macro and function.Joachim Wuttke (l)2018-11-142-10/+38
| | | | | | | | |
| * | | | | | | | Help: in macro vs function example, use lowercase names.Joachim Wuttke (l)2018-11-141-5/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow our own advise not to change cases. Omit the leading underscore.