diff options
| author | Juergen Funk <juergen.funk_ml@cib.de> | 2018-09-05 15:36:23 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-08-07 16:02:05 +0200 |
| commit | 0e60d22e750dd75dcb7b9b17977ed4e4304798ce (patch) | |
| tree | 0f77be5c1fcd07b763ff3d7b50b851b4e0aaf5d1 | |
| parent | Also for SDK 10.0.17134 the winsdklibsubdir needs to have a .0 tacked on (diff) | |
| download | core-0e60d22e750dd75dcb7b9b17977ed4e4304798ce.tar.gz core-0e60d22e750dd75dcb7b9b17977ed4e4304798ce.zip | |
Improve the Windows SDK 10 ProductVersion-Path
At the moment the ProductVersion-Path has always the same format,
with this patch, when the format the same, then no change is need for
the next Version.
Change-Id: I6a52fd20751ba139dd5ed6e3802f29c5e8f02975
Reviewed-on: https://gerrit.libreoffice.org/60041
Tested-by: Jenkins
Reviewed-by: Juergen Funk (CIB) <juergen.funk_ml@cib.de>
(cherry picked from commit dfb18a0557d5a897f443fd1f1d617365f6ae134a)
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 19487e019ff5..1bef6421f028 100644 --- a/configure.ac +++ b/configure.ac @@ -5193,16 +5193,17 @@ find_winsdk_version() reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/v${1}/ProductVersion" if test -n "$regvalue"; then winsdkbinsubdir="$regvalue".0 - fi - winsdklibsubdir=$regvalue - if test "$regvalue" = "10.0.14393"; then - winsdklibsubdir="10.0.14393.0" - elif test "$regvalue" = "10.0.16299"; then - winsdklibsubdir="10.0.16299.0" - elif test "$regvalue" = "10.0.15063"; then - winsdklibsubdir="10.0.15063.0" - elif test "$regvalue" = "10.0.17134"; then - winsdklibsubdir="$regvalue.0" + winsdklibsubdir=$winsdkbinsubdir + tmppath="$winsdktest\\Include\\$winsdklibsubdir" + # test exist the SDK path + if test -d "$tmppath"; then + # when path is convertable to a short path then path is okay + if ! cygpath -d "$tmppath"; then + AC_MSG_ERROR([Windows SDK doesn't have a 8.3 name, see NtfsDisable8dot3NameCreation]) + fi + else + AC_MSG_ERROR([The Windows SDK not found, check the installation]) + fi fi return fi |