summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* MSVC: Revert "Default to -ZI instead of /Zi for x86 and x64"Brad King2022-06-091-3/+2
| | | | | | | | | | | | | | Revert commit 5fcadc481e (MSVC: Default to -ZI instead of /Zi for x86 and x64, 2022-05-24). The `-ZI` flag is incompatible with the `-GL` flag used for IPO, and so is not an unconditionally better default. Revert the change pending future design of a first-class setting for MSVC debug info format that can be automatically reconciled with IPO settings. That commit introduced policy CMP0138, but we already have later policy numbers used too. Leave placeholder text to avoid policy renumbering. Issue: #23607, #10189
* Merge topic 'vs-android-api' into release-3.24Brad King2022-06-091-0/+4
|\ | | | | | | | | | | | | | | 9d6a080421 VS: Add AndroidAPILevel element to generated project files Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !7339
| * VS: Add AndroidAPILevel element to generated project filesBenjamín de la Fuente Ranea2022-06-081-0/+4
| | | | | | | | | | | | | | Map `CMAKE_SYSTEM_VERSION` to the Android Target API Level for Visual Studio projects. Fixes: #22886
* | Begin 3.24 release versioningBrad King2022-06-081-3/+3
| |
* | CMake Nightly Date StampKitware Robot2022-06-081-1/+1
|/
* CMake Nightly Date StampKitware Robot2022-06-071-1/+1
|
* Merge topic 'if-command-PATH_EQUAL'Brad King2022-06-063-1/+32
|\ | | | | | | | | | | | | | | be4b9e10af if command: Add PATH_EQUAL operator Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7321
| * if command: Add PATH_EQUAL operatorMarc Chevrier2022-06-033-1/+32
| |
* | CMake Nightly Date StampKitware Robot2022-06-061-1/+1
| |
* | CMake Nightly Date StampKitware Robot2022-06-051-1/+1
| |
* | Merge topic 'update-kwsys'Brad King2022-06-045-12/+18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 1869f82823 Merge branch 'upstream-KWSys' into update-kwsys 6b88084658 KWSys 2022-06-03 (c28e27bc) Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7322
| * | Merge branch 'upstream-KWSys' into update-kwsysBrad King2022-06-035-12/+18
| | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2022-06-03 (c28e27bc)
* | | CMake Nightly Date StampKitware Robot2022-06-041-1/+1
| |/ |/|
* | Merge topic 'genex-PATH_EQUAL'Brad King2022-06-031-0/+18
|\ \ | |/ |/| | | | | | | | | | | 4d1883df11 Genex-PATH_EQUAL: path comparison Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7309
| * Genex-PATH_EQUAL: path comparisonMarc Chevrier2022-06-011-0/+18
| | | | | | | | To complete issue #23498
* | CMake Nightly Date StampKitware Robot2022-06-031-1/+1
| |
* | Merge topic 'automoc-silence-ranlib-warning'Brad King2022-06-021-1/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | 4a9daae483 automoc: silence linker warning on macos Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7296
| * | automoc: silence linker warning on macosTim Blechmann2022-06-011-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when an empty `mocs_compilation.cpp` is included in a static library, the macos linker emits a warning: ``` /Applications/Xcode13.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: path/To/Library.a(mocs_compilation.cpp.o) has no symbols ``` we therefore generate a globally visible weak symbol in the form of a virtual function table
* | | CMake Nightly Date StampKitware Robot2022-06-021-1/+1
| | |
* | | Merge topic 'ninja-dedup-def'Brad King2022-06-017-58/+41
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | 6cc417586e Ninja: Avoid duplicating /DEF: linker flag with MSVC tools 39dba8a244 cmLocalGenerator: Adopt AppendModuleDefinitionFlag method Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7307
| * | Ninja: Avoid duplicating /DEF: linker flag with MSVC toolsBrad King2022-05-312-19/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 9a0d5a828a (Ninja: add /DEF: flag to linker call, 2012-03-10, v2.8.8~22^2~7) the logic should have been added to `GetTargetFlags` in place of the older logic in that method from commit 7cef36c628 (ENH: add the ability to generate custom commands for a language that is not supported by an IDE, 2004-10-21, v2.4.0~2655). Fixes: #23570
| * | cmLocalGenerator: Adopt AppendModuleDefinitionFlag methodBrad King2022-05-317-41/+41
| |/ | | | | | | Migrate from `cmCommonTargetGenerator::AddModuleDefinitionFlag`.
* | Merge topic 'genex-PATH'Craig Scott2022-06-011-0/+436
|\ \ | | | | | | | | | | | | | | | | | | f11e66670b Genex-PATH: path handling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7292
| * | Genex-PATH: path handlingMarc Chevrier2022-05-311-0/+436
| | | | | | | | | | | | Fixes: #23498
* | | CMake Nightly Date StampKitware Robot2022-06-011-1/+1
| |/ |/|
* | Merge topic 'cmake-gui-locale'Brad King2022-05-311-0/+14
|\ \ | | | | | | | | | | | | | | | | | | ae13524e3b cmake-gui: Restore support for internationalization with Qt5 on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7303
| * | cmake-gui: Restore support for internationalization with Qt5 on WindowsBrad King2022-05-271-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Restore the logic removed by commit 035078d847 (cmake-gui: Remove explicit locale setup, 2020-12-17, v3.20.0-rc1~205^2~6), but only with Qt5 on Windows. Leave a FIXME comment to support Qt6 later. Fixes: #23562 Issue: #23565
* | | CMake Nightly Date StampKitware Robot2022-05-311-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2022-05-301-1/+1
| |/ |/|
* | CMake Nightly Date StampKitware Robot2022-05-291-1/+1
| |
* | CMake Nightly Date StampKitware Robot2022-05-281-1/+1
| |
* | Merge topic 'msvc-compilers-default-to-ZI'Brad King2022-05-271-1/+4
|\ \ | | | | | | | | | | | | | | | | | | 5fcadc481e MSVC: Default to -ZI instead of /Zi for x86 and x64 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7295
| * | MSVC: Default to -ZI instead of /Zi for x86 and x64Glen Chung2022-05-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a policy for compatibility. For more information, see [1]. [1] https://docs.microsoft.com/en-us/cpp/build/reference/z7-zi-zi-debug-information-format?view=msvc-170 Fixes: #10189
* | | Merge topic 'mingw-compiler-PATH'Brad King2022-05-273-65/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 55ba10dcfd MSYS/MinGW Makefiles: Simplify selection of windres as Resource Compiler 9019537670 MSYS/MinGW Makfiles: Select the compiler occurring first in PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: مهدي شينون (Mehdi Chinoune) <mehdi.chinoune@hotmail.com> Merge-request: !7301
| * | | MSYS/MinGW Makefiles: Simplify selection of windres as Resource CompilerBrad King2022-05-263-41/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 957c2aac7f (RC: Simplify selection of resource compiler based on C/C++ toolchain, 2015-05-07, v3.3.0-rc1~101^2~3), `windres` is selected automatically when using compilers that target the GNU ABI. Drop the generator-specific preference to make behavior more consistent with the Ninja generator. Issue: #23542
| * | | MSYS/MinGW Makfiles: Select the compiler occurring first in PATHBrad King2022-05-262-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the change from commit e01990999a (Ninja: On Windows, select the compiler occurring first in PATH, 2020-04-17, v3.18.0-rc1~291^2) to apply to the MSYS/MinGW Makefiles generators too. Drop the implied `gcc` and `g++` default compilers. This allows MinGW/Clang environments to work out of the box. Inspired-by: Mehdi Chinoune <mehdi.chinoune@hotmail.com> Fixes: #23542
* | | | CMake Nightly Date StampKitware Robot2022-05-271-1/+1
|/ / /
* | | Merge topic 'verify-interface-header-sets-list'Brad King2022-05-261-5/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | aadaac7f6d VERIFY_INTERFACE_HEADER_SETS: Add property for list of header sets Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7298
| * | | VERIFY_INTERFACE_HEADER_SETS: Add property for list of header setsKyle Edwards2022-05-251-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new property, INTERFACE_HEADER_SETS_TO_VERIFY, which contains a list of header sets that should be verified by VERIFY_INTERFACE_HEADER_SETS. Fixes: #23522
* | | | Merge topic 'automoc-build-dir'Brad King2022-05-262-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 76608c60d3 AutoMoc: Take AUTOMOC_BUILD_DIR into account in depfile Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Acked-by: alcroito <alexandru.croitor@qt.io> Merge-request: !7291
| * | | | AutoMoc: Take AUTOMOC_BUILD_DIR into account in depfileJoerg Bornemann2022-05-252-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the Ninja generator and targets that have AUTOMOC_BUILD_DIR set, the AutoMoc target was always out of date. That was because the depfile in the AutoMoc build directory was referencing the wrong timestamp file: target_autogen/timestamp: ...dependencies... instead of automoc_build_dir/timestamp: ...dependencies... Use the relative path of the timestamp file as rule name for the depfile. That path is calculated with AUTOMOC_BUILD_DIR taken into account. Fixes: #23547
* | | | | CMake Nightly Date StampKitware Robot2022-05-261-1/+1
| |/ / / |/| | |
* | | | Merge topic 'dependency-providers'Brad King2022-05-258-12/+239
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2aa83fa15b Dependency providers: Add find_package and FetchContent support 8a28368feb FetchContent: Don't discard non-empty SOURCE_DIR and BINARY_DIR 8ce9bb8a0c FetchContent: Don't leak internal variables 74a6ddc339 cmFindPackageCommand: Handle Makefile variable definitions more robustly Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Gerhard Olsson <gerhard.nospam@gmail.com> Merge-request: !7276
| * | | | Dependency providers: Add find_package and FetchContent supportCraig Scott2022-05-248-1/+220
| | | | | | | | | | | | | | | Fixes: #22619
| * | | | cmFindPackageCommand: Handle Makefile variable definitions more robustlyCraig Scott2022-05-172-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During argument parsing in InitialPass(), Makefile variables were being added for components. Most other such variables were set in the call to SetModuleVariables(), which happens much later. Both sets of variables were then restored to their previous values as part of a call to AppendSuccessInformation(), but that is not an obvious nor robust place to undo those variable changes. InitialPass() also pushes a new item to the package root stack, but the corresponding pop was in AppendSuccessInformation(). Again, this puts a symmetric operation in an asymmetric place. Refactor the code slightly such that Makefile variables are set in one clear location, then restored later in the same function. Also move the package root stack pop into the same function as the push. AppendSuccessInformation() now has one clear responsibility and doesn't perform any unrelated cleanup on behalf of InitialPass().
* | | | | CMake Nightly Date StampKitware Robot2022-05-251-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'curl-debug-callback'Brad King2022-05-241-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e243b379ca cmFileCommand: Fix signature of CURLOPT_DEBUGFUNCTION callback Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7288
| * | | | cmFileCommand: Fix signature of CURLOPT_DEBUGFUNCTION callbackBrad King2022-05-231-2/+2
| | | | | | | | | | | | | | | | | | | | Curl documents that the callback should return type `int`.
* | | | | Merge topic 'reduce-policy-eval-scope'Brad King2022-05-241-4/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb19a63499 cmConditionEvaluator: Reduce the scope of the CMP0064 evaluation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7287
| * | | | | cmConditionEvaluator: Reduce the scope of the CMP0064 evaluationAlex Turbov2022-05-231-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When evaluatig conditions, avoid testing CMP0064 unless it's really needed (Cuz most of the time it doesn't)