summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* cmake: configure preset add support for --install-prefix mappingRobert Maynard2021-03-093-4/+43
|
* cmake: add support for --install-prefix command argumentRobert Maynard2021-03-042-0/+19
| | | | Fixes: #21781
* Merge topic 'cpack-dmg-filesystem'Brad King2021-03-031-1/+6
|\ | | | | | | | | | | | | e3ac388738 cpack: add CPACK_DMG_FILESYSTEM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5873
| * cpack: add CPACK_DMG_FILESYSTEMKevin Ushey2021-03-021-1/+6
| | | | | | | | | | | | | | Allow users to configure the filesystem format of the generated `.dmg` via the `CPACK_DMG_FILESYSTEM` option. Fixes: #21874
* | CMake Nightly Date StampKitware Robot2021-03-031-1/+1
| |
* | CMake Nightly Date StampKitware Robot2021-03-021-1/+1
|/
* CMake Nightly Date StampKitware Robot2021-03-011-1/+1
|
* CMake Nightly Date StampKitware Robot2021-02-281-1/+1
|
* CMake Nightly Date StampKitware Robot2021-02-271-1/+1
|
* Merge topic 'include-dir-style'Brad King2021-02-269-36/+48
|\ | | | | | | | | | | | | | | 3e7dd39747 cmLocalGenerator: Simplify some GetIncludeFlag call sites a133a583d4 cmLocalGenerator: Clarify GetIncludeFlags signature Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5859
| * cmLocalGenerator: Simplify some GetIncludeFlag call sitesBrad King2021-02-252-9/+5
| | | | | | | | | | The path style argument is meaningful only with the Ninja generator, so drop it from call sites in Makefile and Xcode generators.
| * cmLocalGenerator: Clarify GetIncludeFlags signatureBrad King2021-02-259-36/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | Make the `config` argument non-optional so all callers must be explicit. Convert the path style argument to an enumeration to make its role clear at call sites. The path style argument is implemented by `ConvertToIncludeReference`, which was introduced with the Ninja generator by commit 5b114c9bee (Introduce a cmLocalGenerator::ConvertToIncludeReference function, 2011-09-07, v2.8.7~187^2~4). Its only purpose is to allow the Ninja generator to use relative paths in `-I` flags. Add a comment explaining this role.
* | Merge topic 'c_17_23'Brad King2021-02-262-2/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8211b4706f IntelLLVM: C17 support b9c3acac02 GNU: C23 support c9f0613c2a GNU: C17 support 10a72c0f1c Clang: Default C standard doesn't depend on compatibility mode 6c2e309a66 Clang: Set standard flags according to frontend variant 9f81591dbf Clang: MSVC-style C flags 72f4984cdc Clang: C23 support 82239d43f8 Clang: C17 default version ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5783
| * | C23 supportRaul Tambre2021-02-252-2/+3
| | |
| * | C17 supportRaul Tambre2021-02-252-2/+4
| |/ | | | | | | Implements #17755.
* | CMake Nightly Date StampKitware Robot2021-02-261-1/+1
|/
* Merge topic 'runtime-dll-deps'Brad King2021-02-255-2/+97
|\ | | | | | | | | | | | | | | f31e8d33ef Genex: Fix grammatical error in TARGET_OBJECTS error message d34d28e688 Genex: Add TARGET_RUNTIME_DLLS genex Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5837
| * Genex: Fix grammatical error in TARGET_OBJECTS error messageKyle Edwards2021-02-241-2/+2
| |
| * Genex: Add TARGET_RUNTIME_DLLS genexKyle Edwards2021-02-245-0/+95
| | | | | | | | Co-Authored-by: Brad King <brad.king@kitware.com>
* | Merge topic 'create-test-source-list-duplicate-decls'Brad King2021-02-251-3/+8
|\ \ | | | | | | | | | | | | | | | | | | 136608dfec cmCreateTestSourceList: avoid generating duplicate declarations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5856
| * | cmCreateTestSourceList: avoid generating duplicate declarationsBen Boeckel2021-02-241-3/+8
| | | | | | | | | | | | | | | This avoids warnings with `clang-tidy`'s `-readability-redundant-declaration` lint in generated source code.
* | | CMake Nightly Date StampKitware Robot2021-02-251-1/+1
| |/ |/|
* | Merge topic 'autouic-headers-ninja'Brad King2021-02-242-0/+33
|\ \ | | | | | | | | | | | | | | | | | | 1265c65b33 AUTOUIC: Collect ui header files for Ninja generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5803
| * | AUTOUIC: Collect ui header files for Ninja generatorAlexey Edelev2021-02-232-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The '<user target>_autogen/timestamp' target supposed to generate ui header files using the 'uic'. Ninja must have information about these header files as a result of generating. The fix collects .ui files of the user target and generates a list of the ui headers that need to be added to the generating results of the '<user target>_autogen/timestamp' target. The case when the .ui files are not specified and collected by AUTOUIC from the include directives of the project source files is not covered in this patch. Fixes: #16776
* | | Merge topic 'preset-flag-consistency'Brad King2021-02-243-5/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6fa3647023 ctest: Add support for '--prefix=<prefix>' form of the argument 3357d37761 cmake: Add support for '--build --prefix=<prefix>' form of the argument 2f13fdef0a cmake: Document '--preset <preset>' form of the argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5849
| * | | ctest: Add support for '--prefix=<prefix>' form of the argumentBrad King2021-02-232-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The main `cmake --preset` argument for configure presets supports both forms, so support it for `ctest --preset` too. Fixes: #21855
| * | | cmake: Add support for '--build --prefix=<prefix>' form of the argumentBrad King2021-02-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The main `cmake --preset` argument for configure presets supports both forms, so support it for `cmake --build --preset` too. Issue: #21855
| * | | cmake: Document '--preset <preset>' form of the argumentBrad King2021-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This form already works. Document it and add tests. Issue: #21855
* | | | Merge topic 'LINK_LANGUAGE-genex-respects-LINKER_LANGUAGE-property'Brad King2021-02-241-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b722eea925 Genex: LINK_LANGUAGE respects LINKER_LANGUAGE property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5841
| * | | | Genex: LINK_LANGUAGE respects LINKER_LANGUAGE propertyMarc Chevrier2021-02-231-1/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | If target property LINKER_LANGUAGE is set, LINK_LANGUAGE generator expression evaluation must be always successful. This fix can be helpful to elaborate a solution for issue #21818.
* | | | Merge topic 'autogen-cmp0116-fix'Brad King2021-02-2419-147/+192
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 339dbc901f Help: Note that CMP0116 is recorded at the time of CC creation e3740e020e Tests: Test Qt autogen target with CMP0116 set to WARN cf34011ce7 Tests: Test per-CC behavior of CMP0116 3a95503512 Ninja: Use CMP0116 status recorded at time of custom command's creation f01f10e8fb cmCustomCommand: Record value of CMP0116 at time of creation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5848
| * | | | Ninja: Use CMP0116 status recorded at time of custom command's creationKyle Edwards2021-02-231-2/+2
| | | | |
| * | | | cmCustomCommand: Record value of CMP0116 at time of creationKyle Edwards2021-02-2318-145/+190
| | | | |
* | | | | Merge topic 'preset-no-comments'Brad King2021-02-241-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 06e16ea008 Merge branch 'backport-3.19-preset-no-comments' into preset-no-comments afaa69f5b3 Tests: Remove comments from CMakePresetsTest/Good.json.in 4a92277f45 Revert "Help: Document JSON comment support in cmake-presets(7)" 431dd59b5e CMakePresets.json: Remove undocumented support for comments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5853
| * \ \ \ \ Merge branch 'backport-3.19-preset-no-comments' into preset-no-commentsBrad King2021-02-241-0/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | CMakePresets.json: Remove undocumented support for commentsKyle Edwards2021-02-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21858
| | * | | | CMake 3.19.5v3.19.5Brad King2021-02-151-1/+1
| | | | | |
| * | | | | Merge topic 'cmake-gui-restore-search' into release-3.20Brad King2021-02-232-0/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 134d69121e cmake-gui: Restore search bar for cache view and environment dialog Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5845
| * \ \ \ \ \ Merge topic 'per-config-autogen-info-file' into release-3.20Brad King2021-02-232-4/+4
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3df25c694 Autogen: Don't change the order of HEADERS array in AutogenInfo.json Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5840
* | | | | | | CMake Nightly Date StampKitware Robot2021-02-241-1/+1
| | | | | | |
* | | | | | | Merge topic 'cpack_nsis_executable_custom'Brad King2021-02-231-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e8b99d01a CPack/NSIS: Add option for setting custom makensis executable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5839
| * | | | | | | CPack/NSIS: Add option for setting custom makensis executableJohnny Jazeix2021-02-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It allows users to set a custom one without changing the PATH environment variable. Fixes: #21733
* | | | | | | | Merge topic 'cmake-gui-restore-search'Brad King2021-02-232-0/+10
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 134d69121e cmake-gui: Restore search bar for cache view and environment dialog Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5845
| * | | | | | | cmake-gui: Restore search bar for cache view and environment dialogSankhesh Jhaveri2021-02-222-0/+10
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was broken by commit f1de6f6682 (cmake-gui: Support building against Qt6, 2020-12-17, v3.20.0-rc1~205^2~7). Fixes: #21850
| * | | | | | Merge topic 'vs-pch-one-lang' into release-3.20Brad King2021-02-221-7/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9945b3b565 VS: Restore support for PCH in CXX but not C within once target d9fd32b3b3 cmVisualStudio10TargetGenerator: Refactor per-source PCH logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5836
| * \ \ \ \ \ \ Merge topic 'cpackifw-scanbuild-fix' into release-3.20Brad King2021-02-221-2/+9
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90c2f138ee CPackIFWInstaller: Avoid potential null pointer dereference Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5832
* | \ \ \ \ \ \ \ Merge topic 'per-config-autogen-info-file'Brad King2021-02-232-4/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3df25c694 Autogen: Don't change the order of HEADERS array in AutogenInfo.json Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5840
| * | | | | | | | Autogen: Don't change the order of HEADERS array in AutogenInfo.jsonCraig Scott2021-02-222-4/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt6 reads our internal AutogenInfo.json file. In 92d7b456e5 (Autogen: Add support for per-config sources, 2020-10-20), the ordering of the HEADERS array elements was changed and this broke their cmake_automoc_parser. We don't need to change the order of the array elements, we can append to the existing ones instead. Do this to allow their cmake_automoc_parser to continue to work. Fixes: #21823
* | | | | | | | CMake Nightly Date StampKitware Robot2021-02-231-1/+1
| | | | | | | |
* | | | | | | | PCH PDB: Fix misuse of IS_NEWER_THAN in timestamp checkCraig Scott2021-02-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a file system which only has second resolution timestamps, there is a reasonably high likelihood of timestamps being the same. The IS_NEWER_THAN test returns true when timestamps are the same, so don't retry copying the PCH PDB file when they match exactly.