maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixing onecore.lib link issue

Browse source
This commit is contained in:
Mike Richmond 2016-08-10 21:45:45 -07:00
parent a951e1b737
commit 5baa2d6fe6
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/powershell-native/nativemsh/pwrshexe/CMakeLists.txt
View file

@ -12,10 +12,25 @@ if (BUILD_ONECORE)
${STATIC_MT_CRT_LIB}
${STATIC_MT_VCRT_LIB}
)
set(powershell_definitions
_CONSOLE
CORECLR
)
set(powershell_definitions
_CONSOLE
CORECLR
)
#
# Configure lib directories so that CI picks up onecore.lib
#
SET (WindowsSdkDir $ENV{WindowsSdkDir})
SET (WindowsSDKVersion $ENV{WindowsSDKVersion})
SET (WindowsSDKLibBase "${WindowsSdkDir}/Lib/${WindowsSDKVersion}")
SET (OneCoreLibBase "$ENV{VCInstallDir}lib/onecore/amd64")
SET (LibraryPath)
list (APPEND LibraryPath "${OneCoreLibBase}")
list (APPEND LibraryPath "${WindowsSDKLibBase}ucrt/${WindowsSDKPlatform}")
list (APPEND LibraryPath "${WindowsSDKLibBase}um/${WindowsSDKPlatform}" )
link_directories(${LibraryPath})
else ()
# Settings to use when creating PowerShell.exe for Windows on full SKUs or downlevel platforms
set(PWRSHEXE_WINDOWS_SOURCES