summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'xcode-generation-enablegpuframecapturemode'Brad King2021-11-1211-7/+71
|\ | | | | | | | | | | | | | | | | 0798edfb85 Tests: Xcode scheme ENABLE_GPU_FRAME_CAPTURE_MODE e09a3eddb6 Xcode: Support "GPU Frame Capture" scheme property Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6639
| * Tests: Xcode scheme ENABLE_GPU_FRAME_CAPTURE_MODEJake Turner2021-11-092-7/+19
| | | | | | | | | | | | | | Setting numerical value Caseless comparison of string values "Metal" is converted to value 1 "Disabled" is converted to value 3
| * Xcode: Support "GPU Frame Capture" scheme propertyJake Turner2021-10-199-0/+52
| | | | | | | | | | | | | | | | | | | | | | Added XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE variable which sets the scheme property value for "GPU Frame Capture" in the Options section by setting the Xcode project variable "enableGPUFrameCaptureMode". Example values are "Metal" (1) and "Disabled" (3). XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE is initialized by the property CMAKE_XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE. Implements: #22700
* | Merge topic 'unity-build-per-config'Brad King2021-11-128-90/+222
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 129e3c6540 Unity Build: Fix per-config sources in multi-config generators ea289314ef VS: Fix pre-VS15.8 unity build exclusion of per-config sources 53990059da cmLocalGenerator: Add dedicated types to hold unity source info de6e362a88 cmLocalGenerator: Clarify name of method to write unity source include lines 3017b3e7d4 cmLocalGenerator: Simplify unity source copy-if-different logic 0b56f92576 cmLocalGenerator: De-duplicate unity source file generation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6720
| * | Unity Build: Fix per-config sources in multi-config generatorsBrad King2021-11-117-31/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Single-config generators already support unity builds with per-config sources because they compute sources using `CMAKE_BUILD_TYPE` as the configuration. Each original source is either included in the unity build source, or not. Teach multi-config generators to compute the list of sources for inclusion in unity builds using all configurations. Previously they only used the empty string as the configuration. Each original source may be included in some configurations, but not others. Use preprocessor conditions to guard their inclusion when necessary. Fixes: #22892
| * | VS: Fix pre-VS15.8 unity build exclusion of per-config sourcesBrad King2021-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | In a unity build, the original source files need to be excluded from the build. Prior to VS 15.8, this is done via `ExcludeFromBuild`, which is the same mechanism used to implement per-config sources. Fix a conflict in the implementation of the two features so that unity-batched sources are excluded from all configurations rather than just those in which they would otherwise have been included.
| * | cmLocalGenerator: Add dedicated types to hold unity source infoBrad King2021-11-112-44/+81
| | |
| * | cmLocalGenerator: Clarify name of method to write unity source include linesBrad King2021-11-102-10/+11
| | |
| * | cmLocalGenerator: Simplify unity source copy-if-different logicBrad King2021-11-101-13/+8
| | |
| * | cmLocalGenerator: De-duplicate unity source file generationBrad King2021-11-102-40/+40
| | |
* | | Merge branch 'release-3.22'Brad King2021-11-120-0/+0
|\ \ \
| * \ \ Merge topic 'cmp0128-fixup' into release-3.22Brad King2021-11-127-28/+47
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e47dfce75d CMP0128: Enable/disable extensions if standard same as default Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6723
* | \ \ \ Merge topic 'cmp0128-fixup'Brad King2021-11-127-28/+47
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | e47dfce75d CMP0128: Enable/disable extensions if standard same as default Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6723
| * | | | CMP0128: Enable/disable extensions if standard same as defaultRaul Tambre2021-11-117-28/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was intended to be part of the initial MR (!6177), but accidentally went missing when debugging nightly failures on less common systems. Noticed during !6711 review as the comment about this behaviour didn't match the code. Documentation for CMP0128 is updated to remove a false case and note the two cases related to this. Fixes #22224.
* | | | | Merge branch 'release-3.22'Brad King2021-11-120-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'release-3.21' into release-3.22Brad King2021-11-120-0/+0
| |\ \ \ \
* | \ \ \ \ Merge branch 'release-3.21'Brad King2021-11-120-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'release-3.20' into release-3.21Brad King2021-11-120-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'IntelLLVM-Fortran-frontend-variant' into release-3.21Brad King2021-11-111-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !6718
* | \ \ \ \ \ \ Merge branch 'release-3.20'Brad King2021-11-120-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'IntelLLVM-Fortran-frontend-variant' into release-3.20Brad King2021-11-111-0/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | Merge-request: !6718
* | | | | | | | Merge branch 'release-3.22'Brad King2021-11-120-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge topic 'IntelLLVM-Fortran-frontend-variant' into release-3.22Brad King2021-11-121-0/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b1edd6e7c7 Fortran: Save frontend variant persistently for IntelLLVM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6718
* | | | | | | | Merge topic 'IntelLLVM-Fortran-frontend-variant'Brad King2021-11-121-0/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b1edd6e7c7 Fortran: Save frontend variant persistently for IntelLLVM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6718
| * | | | | | | Fortran: Save frontend variant persistently for IntelLLVMWilliam R. Dieter2021-11-111-0/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit a90d2a9eed (IntelLLVM: Add support for Intel LLVM-based compilers, 2020-11-02, v3.20.0-rc1~89^2~20), our IntelLLVM compiler support populates `CMAKE_Fortran_COMPILER_FRONTEND_VARIANT`. However, the frontend variant was not stored in `CMakeCompilerFortran.cmake`. Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
* | | | | | | Merge branch 'release-3.22'Brad King2021-11-120-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'ti-armcl-unknown-arg-warning' into release-3.22Brad King2021-11-121-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 220f78e253 TI: Recognize invalid compiler option warning during try_compile() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6705
* | \ \ \ \ \ \ Merge topic 'ti-armcl-unknown-arg-warning'Brad King2021-11-121-0/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 220f78e253 TI: Recognize invalid compiler option warning during try_compile() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6705
| * | | | | | | TI: Recognize invalid compiler option warning during try_compile()Craig Scott2021-11-111-0/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | Fixes: #22866
* | | | | | | Merge branch 'release-3.22'Brad King2021-11-120-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'ci-vs2022' into release-3.22Brad King2021-11-125-28/+29
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 190d2b5d55 gitlab-ci: Update Windows jobs to VS 2022 ac32794983 gitlab-ci: Re-organize Windows job tags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6724
* | | | | | | Merge topic 'ci-vs2022'Brad King2021-11-125-40/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0e6bdb90e5 Merge branch 'backport-3.22-ci-vs2022' into ci-vs2022 b63a87582f gitlab-ci: Update Windows jobs to VS 2022 190d2b5d55 gitlab-ci: Update Windows jobs to VS 2022 ac32794983 gitlab-ci: Re-organize Windows job tags 39bdb1e332 gitlab-ci: Re-organize Windows job tags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6724
| * \ \ \ \ \ \ Merge branch 'backport-3.22-ci-vs2022' into ci-vs2022Brad King2021-11-110-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | gitlab-ci: Update Windows jobs to VS 2022Brad King2021-11-115-28/+29
| | | | | | | |
| | * | | | | | gitlab-ci: Re-organize Windows job tagsBrad King2021-11-112-5/+5
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Name the tag groups based on the VS version needed.
| * | | | | | gitlab-ci: Update Windows jobs to VS 2022Brad King2021-11-115-36/+37
| | | | | | |
| * | | | | | gitlab-ci: Re-organize Windows job tagsBrad King2021-11-112-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Name the tag groups based on the VS version needed, if any. Drop VS-related tags from Windows jobs that do not need any pre-installed VS version.
* | | | | | | CMake Nightly Date StampKitware Robot2021-11-121-1/+1
|/ / / / / /
* | | | | | Merge topic 'xcode-embed-plugins'Brad King2021-11-1110-0/+56
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e1e7dc7db Xcode: Add embedded plugins option Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6690
| * | | | | | Xcode: Add embedded plugins optionGusts Kaksis2021-11-1010-0/+56
| | | | | | |
* | | | | | | Merge topic 'FindVulkan-pre-1.2.175'Brad King2021-11-111-4/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db8bd5965f FindVulkan: Fix finding versions < 1.2.175 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6717
| * | | | | | | FindVulkan: Fix finding versions < 1.2.175Ralf Habacker2021-11-101-4/+9
| | | | | | | |
* | | | | | | | Merge topic 'FindThreads-libc-pthread-flag'Brad King2021-11-111-8/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 68285bc8a9 FindThreads: Honor THREADS_PREFER_PTHREAD_FLAG when pthread is found in libc Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6693
| * | | | | | | | FindThreads: Honor THREADS_PREFER_PTHREAD_FLAG when pthread is found in libcMattias Ellert2021-11-101-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `-pthread` flag tells the compiler/linker to link to additional libraries needed for thread support (e.g. libatomic on riscv64). The flag therefore should be used if requested using `THREADS_PREFER_PTHREAD_FLAG` also when the pthread functions are found in libc.
* | | | | | | | | Merge branch 'release-3.22'Brad King2021-11-110-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'release-3.21' into release-3.22Brad King2021-11-110-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
* | | | | | | | | Merge branch 'release-3.21'Brad King2021-11-110-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'IntelLLVM-no-xilink' into release-3.21Brad King2021-11-101-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !6719
* | \ \ \ \ \ \ \ \ Merge branch 'release-3.22'Brad King2021-11-110-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'IntelLLVM-no-xilink' into release-3.22Brad King2021-11-111-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48f29b5805 IntelLLVM: Use MSVC linker with MSVC frontend variant Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6719
generated by cgit v0.12 at 2025-03-10 17:30:39 (GMT)