Skip to content

Commit 50880f0

Browse files
committed
Let UniversalCRTSdkDir return None as before
1 parent d812a3a commit 50880f0

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

setuptools/msvc.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -703,14 +703,14 @@ def FSharpInstallDir(self) -> str:
703703
return self.ri.lookup(path, 'productdir') or ''
704704

705705
@property
706-
def UniversalCRTSdkDir(self) -> str:
706+
def UniversalCRTSdkDir(self) -> str | None:
707707
"""
708708
Microsoft Universal CRT SDK directory.
709709
710710
Return
711711
------
712712
str
713-
path
713+
path | None
714714
"""
715715
# Set Kit Roots versions for specified MSVC++ version
716716
vers = ('10', '81') if self.vs_ver >= 14.0 else ()
@@ -721,10 +721,10 @@ def UniversalCRTSdkDir(self) -> str:
721721
if sdkdir:
722722
return sdkdir
723723

724-
return ''
724+
return None
725725

726726
@property
727-
def UniversalCRTSdkLastVersion(self):
727+
def UniversalCRTSdkLastVersion(self) -> str:
728728
"""
729729
Microsoft Universal C Runtime SDK last version.
730730
@@ -733,7 +733,9 @@ def UniversalCRTSdkLastVersion(self):
733733
str
734734
version
735735
"""
736-
return self._use_last_dir_name(os.path.join(self.UniversalCRTSdkDir, 'lib'))
736+
return self._use_last_dir_name(
737+
os.path.join(self.UniversalCRTSdkDir or '', 'lib')
738+
)
737739

738740
@property
739741
def NetFxSdkVersion(self):
@@ -1345,7 +1347,7 @@ def HTMLHelpWorkshop(self):
13451347
return [os.path.join(self.si.ProgramFilesx86, 'HTML Help Workshop')]
13461348

13471349
@property
1348-
def UCRTLibraries(self):
1350+
def UCRTLibraries(self) -> list[str]:
13491351
"""
13501352
Microsoft Universal C Runtime SDK Libraries.
13511353
@@ -1358,12 +1360,12 @@ def UCRTLibraries(self):
13581360
return []
13591361

13601362
arch_subdir = self.pi.target_dir(x64=True)
1361-
lib = os.path.join(self.si.UniversalCRTSdkDir, 'lib')
1363+
lib = os.path.join(self.si.UniversalCRTSdkDir or '', 'lib')
13621364
ucrtver = self._ucrt_subdir
13631365
return [os.path.join(lib, f'{ucrtver}ucrt{arch_subdir}')]
13641366

13651367
@property
1366-
def UCRTIncludes(self):
1368+
def UCRTIncludes(self) -> list[str]:
13671369
"""
13681370
Microsoft Universal C Runtime SDK Include.
13691371
@@ -1375,7 +1377,7 @@ def UCRTIncludes(self):
13751377
if self.vs_ver < 14.0:
13761378
return []
13771379

1378-
include = os.path.join(self.si.UniversalCRTSdkDir, 'include')
1380+
include = os.path.join(self.si.UniversalCRTSdkDir or '', 'include')
13791381
return [os.path.join(include, f'{self._ucrt_subdir}ucrt')]
13801382

13811383
@property

0 commit comments

Comments
 (0)