summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'export-try-compile-crash' into release-3.24Kyle Edwards2022-07-141-1/+3
|\ | | | | | | | | | | | | | | 29c7546a61 cmGlobalGenerator: Only compute build files for all targets Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7472
| * cmGlobalGenerator: Only compute build files for all targetsKyle Edwards2022-07-131-1/+3
| | | | | | | | | | | | | | | | If we're creating generation objects for imported targets only, we don't need the export sets. Only compute build file generators if generating for all targets. Fixes: #23709
| * Merge branch 'file-set-crash' into release-3.23Brad King2022-06-303-4/+32
| |\ | | | | | | | | | Merge-request: !7420
| * \ Merge topic 'cmake-gui-locale' into release-3.23Brad 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 3.24.0-rc3v3.24.0-rc3Brad King2022-07-071-1/+1
| | | |
* | | | Merge topic 'ccmake-fix-pdcurses-windows' into release-3.24Brad King2022-07-071-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a78d10220c ccmake: Fix mangled configuration log with PDCurses on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7458
| * | | | ccmake: Fix mangled configuration log with PDCurses on WindowsDuncan Ogilvie2022-07-061-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix seems to work on both Windows and Ubuntu (WSL). Issue: #18053
* | | | | Merge topic 'genex-LINK_LIBRARY-check-supported-properties' into release-3.24Brad King2022-07-073-10/+31
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 913ea78d7a Genex LINK_LIBRARY and LINK_GROUP: check supported properties Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7454
| * | | | Genex LINK_LIBRARY and LINK_GROUP: check supported propertiesMarc Chevrier2022-07-063-10/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refines check for properties supporting these genex. Enhance error message. Fixes: #23699
* | | | | genex-LINK_LIBRARY: ensure correct generation inside LINK_GROUP genexMarc Chevrier2022-07-051-0/+11
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix ensures the following pattern is correctly handled: $<LINK_GROUP:group_feat,$<LINK_LIBRARY:lib_feat,mylib>> With: CMAKE_LINK_GROUP_USING_group_feat = "—START_GROUP" "—END_GROUP" CMAKE_LINK_LIBRARY_USING_lib_feat = "—PREFIX" "—LINK <LIBRARY>" "—SUFFIX" Before the fix, we get the following generation: —START_GROUP —PREFIX —LINK /path/to/mylib —END_GROUP —SUFFIX —END_GROUP and —SUFFIX are in the wrong order After the fix, we get the correct order: —START_GROUP —PREFIX —LINK /path/to/mylib —SUFFIX —END_GROUP
* | | | Genex: Fix TARGET_BUNDLE_DIR_NAME incorrect extensionBen Leadbetter2022-07-011-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the genex from commit 997af2e1a6 (Genex: Add TARGET_BUNDLE_DIR_NAME, 2022-04-14, v3.24.0-rc1~233^2) to use the correct bundle directory extension for each bundle type. Fixes: #23683
* | | | Merge topic 'file-set-crash' into release-3.24Brad King2022-06-303-4/+32
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 3fee5398bd install(EXPORT): Check for missing file sets at generate time Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7420
| * | | install(EXPORT): Check for missing file sets at generate timeKyle Edwards2022-06-293-4/+32
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing file sets were originally checked at configure time in install(TARGETS ... EXPORT), but were not checked at generate time. If a file set was added after install(TARGETS ... EXPORT) was called, an abortion error was thrown. Check again at generate time to gracefully display an error message instead of crashing. Fixes: #23680
| * | CMake 3.23.2v3.23.2Brad King2022-05-251-1/+1
| | |
| * | Merge topic 'vs2022-only' into release-3.23Brad King2022-05-201-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 235b5fb05b file(GET_RUNTIME_DEPENDENCIES): Support VS 2022 without VS 2019 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7282
* | \ \ Merge topic 'fix-23523' into release-3.24Brad King2022-06-291-12/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10668f26c9 AUTOUIC: Fix internal paths of generated ui_foo.h files Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7419
| * | | | AUTOUIC: Fix internal paths of generated ui_foo.h filesJosiah Bills2022-06-281-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For every file foo.ui we generate a ui_foo.h file in ${target}_autogen/include or ${target}_autogen/include_$<CONFIG> in the multi-config case. Even .ui files in subdirectories are handled this way. That means, .ui files with the same base name will conflict in a target. However, for .ui files in subdirectories we added generated sources with the nonexistent path ${target}_autogen/include/subdir/ui_foo.h. This patch fixes that. Also, CMake will now yield an error if a target has multiple .ui files with the same base name. Fixes #23523
* | | | | CMake 3.24.0-rc2v3.24.0-rc2Brad King2022-06-231-1/+1
| | | | |
* | | | | VS: Add variable to to turn off Visual Studio compile batchingBrad King2022-06-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the change from commit b764c7c273 (VS: Add property to turn off Visual Studio compile batching, 2022-02-07, v3.24.0-rc1~710^2) by adding a variable to initialize the property on every target. Issue: #23179 Fixes: #23639
* | | | | Merge topic 'use-arm64-msbuild' into release-3.24Brad King2022-06-221-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80273514aa VS: Prefer ARM64 MSBuild on Windows ARM64 host Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7381
| * | | | | VS: Prefer ARM64 MSBuild on Windows ARM64 hostTommy Vercetti2022-06-211-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #23629
* | | | | | cm_cxx_features: filter out warnings from Xcode 14Gregor Jasny2022-06-211-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | ``` xcodebuild[13070:54426] [MT] DVTSDK: Warning: SDK path collision for path ```
* | | | | CMake 3.24.0-rc1v3.24.0-rc1Brad King2022-06-141-1/+1
| | | | |
* | | | | Merge topic 'lcc-warnings' into release-3.24Brad King2022-06-142-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | beb07cdda7 Source: Convince LCC that RAII variables are used Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7357
| * | | | | Source: Convince LCC that RAII variables are usedBrad King2022-06-132-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the change from commit 5ad8862318 (Source: Convince NVHPC that RAII variables are used, 2021-04-26, v3.21.0-rc1~254^2~1) to apply to LCC too.
* | | | | | cmSystemTools: Fix 'ErrorOccurred' spellingFeRD (Frank Dana)2022-06-1356-212/+212
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the booleans 's_ErrorOccured' and 's_FatalErrorOccured' to 's_ErrorOccurred' and 's_FatalErrorOccurred', respectively. Rename the getters and setters to 'Get[Fatal]ErrorOccurred' and 'Set[Fatal]ErrorOccurred', and fix all uses across the codebase.
* | | | | Merge topic 'cmake-gui-qt6-decode' into release-3.24Brad King2022-06-115-105/+81
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 497397bd17 cmake-gui: Support non-ASCII chars on Windows with Qt6 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7346
| * | | | | cmake-gui: Support non-ASCII chars on Windows with Qt6Mehdi Chinoune2022-06-105-105/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit baead1e2a8 (Encoding: Remove option to use ANSI code page internally, 2016-11-01, v3.8.0-rc1~358^2), we always use UTF-8 strings internally. Using fromLocal8Bit/toLocal8Bit + QTextCodec is no longer needed. Convert to fromStdString/toStdString instead, which should work both with Qt5 and Qt6. Fixes: #23565
* | | | | | Merge topic 'cmWindowsRegistry-cstdint' into release-3.24Brad King2022-06-111-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | bc4c0d657a cmWindowsRegistry: Add missing <cstdint> include Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7349
| * | | | | cmWindowsRegistry: Add missing <cstdint> includenanoric2022-06-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is needed for `std::uint8_t`, but was left out of commit 8d7e80cf3d (find_* commands: add control over Windows registry views, 2022-04-16). For some reason the include-what-you-use tool does not think the include is needed, so add an `IWYU pragma` to keep it.
* | | | | | Merge topic 'update-kwsys' into release-3.24Brad King2022-06-101-0/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a54f7a6983 Merge branch 'upstream-KWSys' into update-kwsys 975c44654d KWSys 2022-06-09 (9b65e88d) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7345
| * | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2022-06-091-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2022-06-09 (9b65e88d)
* | | | | | | CheckIPOSupported: Compile check using flags of calling projectBrad King2022-06-101-1/+2
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forward `CMAKE_<LANG>_FLAGS` and `CMAKE_<LANG>_FLAGS_DEBUG` from the calling project into the test project. The set of flags may affect the availability of IPO support. Since this may change the result of the check for existing projects, add a policy for compatibility. This was discovered after commit 5fcadc481e (MSVC: Default to -ZI instead of /Zi for x86 and x64, 2022-05-24) introduced policy CMP0138 to switch our default for MSVC's debug info flag. The `-ZI` flag is incompatible with the `-GL` flag used for IPO, so CMP0138 was reverted pending future work on an alternative solution. Re-use the CMP0138 policy number for this change to CheckIPOSupported instead. Fixes: #23607
* | | | | | 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