summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'null-warning'Brad King2019-09-201-7/+13
|\ | | | | | | | | | | | | | | 1d0d4167cf TestDriver: Fix -Wzero-as-null-pointer-constant warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !3824
| * TestDriver: Fix -Wzero-as-null-pointer-constant warningsSean McBride2019-09-181-7/+13
| |
* | Merge topic 'update-kwsys'Brad King2019-09-2027-367/+654
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | c578caa68b Tests: Decouple Plugin test from KWSys 56879273dc Merge branch 'upstream-KWSys' into update-kwsys 3327c0402a KWSys 2019-09-18 (c6bc38c1) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3828
| * | Tests: Decouple Plugin test from KWSysBrad King2019-09-195-20/+323
| | | | | | | | | | | | | | | | | | KWSys now requires C++11 but we want this test to be able to run as C++98. Copy the KWSys DynamicLoader implementation (with original notice headers and license reference) and update it to work alone.
| * | Merge branch 'upstream-KWSys' into update-kwsysBrad King2019-09-1822-347/+331
| |\ \ | | |/ | |/| | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2019-09-18 (c6bc38c1)
| | * KWSys 2019-09-18 (c6bc38c1)KWSys Upstream2019-09-1822-347/+331
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit c6bc38c11a3a11e393f0608486b08dadc8dbacc3 (master). Upstream Shortlog ----------------- Sean McBride (5): 4de1241f Fixed -Wextra-semi-stmt warning 30de8e17 Fixed -Wsign-conversion warnings by adding casts 750da75a Fixed 64 to 32 bit truncation warning by casting 419aaa35 Fixed -Wunused-macros warnings 46c55893 Replaced several 0, NULL, and KWSYS_NULLPTR with nullptr
* | | Merge topic 'cmake-e-doc-order'Brad King2019-09-201-9/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc3cbf91d2 Help: Fix indentation of create_symlink note 8e9b855a4f Help: Fix ordering of cmake -E commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3833
| * | | Help: Fix indentation of create_symlink noteKyle Edwards2019-09-191-2/+2
| | | |
| * | | Help: Fix ordering of cmake -E commandsKyle Edwards2019-09-181-9/+9
| | | | | | | | | | | | | | | | | | | | Several of the commands were not in alphabetical order. Fix the ordering.
* | | | Merge branch 'release-3.15'Brad King2019-09-200-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'doc-vs-2019-toolset' into release-3.15Brad King2019-09-201-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3841
* | \ \ \ \ Merge topic 'doc-vs-2019-toolset'Brad King2019-09-201-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 67f3dda69b Help: Document VS 2019 toolset in MSVC_TOOLSET_VERSION Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3841
| * | | | | Help: Document VS 2019 toolset in MSVC_TOOLSET_VERSIONLE GARREC Vincent2019-09-201-0/+1
| |/ / / /
* | | | | CMake Nightly Date StampKitware Robot2019-09-201-1/+1
| | | | |
* | | | | Merge topic 'autogen_path_prefix'Brad King2019-09-19114-1779/+2198
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc0900d9cd Help: Add release notes for AUTOMOC_PATH_PREFIX 692d8e3492 Help: Add documentation for AUTOMOC_PATH_PREFIX 1933ade9f1 Tests: At QtAutogen.MocIncludeSymlink test 706d9738a6 Tests: Merge QtAutogen.MocIncludeStrict and MocIncludeRelaxed d018d27c10 Autogen: Add moc path prefix generation (AUTOMOC_PATH_PREFIX) 77983c8147 Autogen: Add IsHeader flag to SourceFileT class f9e5441eb4 Autogen: Abbreviate file paths in messages 51676cf655 Autogen: Split JobEvalCacheT job into separate moc and uic jobs ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3818
| * | | | | Help: Add release notes for AUTOMOC_PATH_PREFIXSebastian Holtermann2019-09-181-0/+13
| | | | | |
| * | | | | Help: Add documentation for AUTOMOC_PATH_PREFIXSebastian Holtermann2019-09-184-0/+45
| | | | | |
| * | | | | Tests: At QtAutogen.MocIncludeSymlink testSebastian Holtermann2019-09-182-0/+81
| | | | | |
| * | | | | Tests: Merge QtAutogen.MocIncludeStrict and MocIncludeRelaxedSebastian Holtermann2019-09-1897-896/+1011
| | | | | |
| * | | | | Autogen: Add moc path prefix generation (AUTOMOC_PATH_PREFIX)Sebastian Holtermann2019-09-165-37/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new `AUTOMOC_PATH_PREFIX` boolean target property enables automatic generation of the path prefix `-p` option for `moc`. `AUTOMOC_PATH_PREFIX` is initialized from the variable `CMAKE_AUTOMOC_PATH_PREFIX`, which is ON by default. When `AUTOMOC_PATH_PREFIX` is enabled, CMake tests if a `moc`ed header file is in one of the include directories. If so, then the `-p` option, with the relative path of the header parent directory to the respective include directory, is added to the `moc` command. If the header file is not in an include directory, the `-p` option is omitted. Closes: #18815 "AUTOMOC: generated files include full relative path, breaking certain reproducible builds"
| * | | | | Autogen: Add IsHeader flag to SourceFileT classSebastian Holtermann2019-09-162-76/+84
| | | | | |
| * | | | | Autogen: Abbreviate file paths in messagesSebastian Holtermann2019-09-166-210/+264
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces the `cmQtAutoGenerator::MessagePath` method, that abbreviates paths by placing a - "SRC:" prefix in place of the project source directory - "BIN:" prefix in place of the project binary directory The method is used in `AUTO{MOC,UIC,RCC}` when paths are displayed in messages. This makes the messages generated by `AUTO{MOC,UIC,RCC}` shorter and improves their readability.
| * | | | | Autogen: Split JobEvalCacheT job into separate moc and uic jobsSebastian Holtermann2019-09-162-259/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This splits the `JobEvalCacheT` job into separate `JobEvalCacheMocT` and `JobEvalCacheUicT` classes, that run concurrently. The `JobEvalCache*T::FindIncluded*` methods are overhauled to store probed directoriy names only if probing fails. Warning messages are refactored to show the file name and the probed directories instead of all probed file paths. This is easier to read.
| * | | | | Autogen: Split JobProbeDepsT job into separate moc and uic jobsSebastian Holtermann2019-09-164-66/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By splitting `JobProbeDepsT` into two independent `JobProbeDepsMocT`, `JobProbeDepsUicT`, the moc and uic job generation will happen concurrently. This should improve the execution speed, when both AUTOMOC and AUTOUIC are enabled. Parent directory names for moc and uic output files are are collected in a `std::unordered_set<std::string>` and get created in a batch. Beforehand we tried to create the parent directory for each output file. This led to duplications of `MakeDirectory` calls when there were multiple output files in the same directory (which is the case usually).
| * | | | | Autogen: Rename job classesSebastian Holtermann2019-09-162-107/+57
| | | | | |
| * | | | | Autogen: Remove CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE sort duplicationSebastian Holtermann2019-09-163-43/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes code that sorts include directories for `AUTOMOC` according to `CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE`. This is possible because the included directories passed to `AUTOMOC` are already sorted, also with respect to `CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE`.
| * | | | | Autogen: Use CollapseFullPath instead of RealPath to support symbolic linksSebastian Holtermann2019-09-163-36/+33
| | | | | |
| * | | | | Autogen: Sanitize include and search directoriesSebastian Holtermann2019-09-161-9/+41
| | | | | |
| * | | | | Autogen: Modernize by using an unnamed namespace instead of static functionsSebastian Holtermann2019-09-161-6/+9
| | | | | |
| * | | | | Autogen: Compute and store generator pointers once in initializer constructorSebastian Holtermann2019-09-162-129/+124
| | | | | |
* | | | | | Merge topic 'refactor-string-concat'Brad King2019-09-1931-797/+545
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9dba84cfa5 Refactor: Use cmStrCat to construct error strings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3734
| * | | | | | Refactor: Use cmStrCat to construct error stringsAsit Dhal2019-09-1831-797/+545
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Replace string construction using std::stringstream with cmStrCat and cmWrap.
* | | | | | Merge topic 'CMakeFindBinUtils-install_name_tool-prefix'Brad King2019-09-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13a7c858c8 Use _CMAKE_TOOLCHAIN_PREFIX for install_name_tool as well Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3830
| * | | | | | Use _CMAKE_TOOLCHAIN_PREFIX for install_name_tool as wellIsuru Fernando2019-09-181-1/+1
| |/ / / / /
* | | | | | Merge topic 'FindGnuTLS-target'Brad King2019-09-196-10/+84
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44e8b8f1f2 FindGnuTLS: add target GnuTLS::GnuTLS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3825
| * | | | | | FindGnuTLS: add target GnuTLS::GnuTLSDavid Callu2019-09-186-10/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a test case for the module.
* | | | | | | CMake Nightly Date StampKitware Robot2019-09-191-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge topic 'command-line-make-functions'Brad King2019-09-1814-186/+93
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c45b95ddd cmMakefile: Remove unused AddUtilityCommand overload 7f3ecbe7d7 cmCustomCommandLine: Provide command line make functions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3819
| * | | | | | cmMakefile: Remove unused AddUtilityCommand overloadDaniel Eiband2019-09-162-37/+0
| | | | | | |
| * | | | | | cmCustomCommandLine: Provide command line make functionsDaniel Eiband2019-09-1612-149/+93
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Reduce boilerplate necessary to create custom command lines by introducing and applying cmMakeCommandLine and cmMakeSingleCommandLine functions.
* | | | | | Merge topic 'smart_ptr/cmCPackGeneratorFactory'Kyle Edwards2019-09-183-31/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9c1eb99fe cmCPackGeneratorFactory: rule of zero Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3826
| * | | | | | cmCPackGeneratorFactory: rule of zeroTushar Maheshwari2019-09-173-31/+11
| | | | | | |
* | | | | | | Merge topic 'shared-pch'Brad King2019-09-1819-54/+345
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 729d997f10 Precompile Headers: Add REUSE_FROM signature Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Rickard Englund <rickard@r-englund.com> Acked-by: Viktor Kirilov <vik.kirilov@gmail.com> Merge-request: !3762
| * | | | | | Precompile Headers: Add REUSE_FROM signatureCristian Adam2019-09-1719-54/+345
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the ability to share precompiled headers artifacts between targets. Fixes: #19659
* | | | | | CMake Nightly Date StampKitware Robot2019-09-181-1/+1
| |/ / / / |/| | | |
* | | | | Merge topic 'byproduct-collapse-full-path'Brad King2019-09-176-6/+32
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b409643bd Byproducts: Add test for collapsing of full paths in byproducts 445ff5ccdf Byproducts: collapse full paths of custom target byproducts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3804
| * | | | | Byproducts: Add test for collapsing of full paths in byproductsDaniel Eiband2019-09-165-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test for collapsing of full paths in byproducts and additional tests for the GENERATED source file properties set by add_custom_command and add_custom_target with relative paths.
| * | | | | Byproducts: collapse full paths of custom target byproductsDaniel Eiband2019-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collapse full paths of add_custom_target command byproducts for symmetry with byproducts passed to the add_custom_command command.
* | | | | | Merge topic 'smart_ptr/cmSourceFile'Brad King2019-09-173-30/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c83f39a90 cmSourceFile: use unique_ptr for CustomCommand Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !3815
| * | | | | | cmSourceFile: use unique_ptr for CustomCommandTushar Maheshwari2019-09-133-30/+14
| |/ / / / /