diff options
| author | Tarja Sundqvist <[email protected]> | 2025-01-10 14:45:45 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <[email protected]> | 2025-01-10 14:45:45 +0200 |
| commit | 77c4670a926c461d182db33242edac779f9e44d2 (patch) | |
| tree | 4c61f0ba4e88cff411a0560b4602cf74448dca42 /cmake/Functions.cmake | |
| parent | 864b08394d1e6d366d7c136ffc50e27adfd08447 (diff) | |
| parent | 824be6fd525f415488c6117db8b03e1a90cabf05 (diff) | |
Merge tag 'v6.5.4-lts' into 6.5.4v6.5.4-lts-lgpl6.5.4
Qt 6.5.4-lts release
Change-Id: Ie240e184ec34fe43acab017cffd6888ab53aefbe
Diffstat (limited to 'cmake/Functions.cmake')
| -rw-r--r-- | cmake/Functions.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index 73a06d59f..fa05bfbdf 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -918,6 +918,8 @@ macro(append_compiler_linker_sdk_setup) endif() extend_gn_list(gnArgArg ARGS is_clang CONDITION CLANG) + extend_gn_list(gnArgArg ARGS is_msvc CONDITION MSVC) + if(CLANG) if(MACOS) get_darwin_sdk_version(macSdkVersion) @@ -976,7 +978,7 @@ macro(append_compiler_linker_sdk_setup) endif() endif() - if(WIN32) + if(MSVC) get_filename_component(windowsSdkPath $ENV{WINDOWSSDKDIR} ABSOLUTE) get_filename_component(visualStudioPath $ENV{VSINSTALLDIR} ABSOLUTE) list(APPEND gnArgArg |