mirror of
https://github.com/PowerShell/PowerShell
synced 2026-06-08 12:12:50 +00:00
Deploy powershell.exe as content for ConsoleHost
CMake will now output the artifacts of the native build into the ConsoleHost project, where .NET CLI picks it up as content and deploys it automatically.
This commit is contained in:
@@ -176,7 +176,6 @@ function Start-PSBuild {
|
||||
cmake ..\src\powershell-native
|
||||
}
|
||||
msbuild powershell.vcxproj /p:Configuration=$msbuildConfiguration
|
||||
# cp -rec $msbuildConfiguration\* $Output
|
||||
} finally {
|
||||
Pop-Location
|
||||
}
|
||||
|
||||
@@ -14,6 +14,10 @@
|
||||
"Microsoft.PowerShell.Commands.Utility": "1.0.0-*"
|
||||
},
|
||||
|
||||
"content": [
|
||||
"powershell.exe"
|
||||
],
|
||||
|
||||
"frameworks": {
|
||||
"net451": {
|
||||
}
|
||||
|
||||
@@ -3,6 +3,9 @@ project(PowerShell)
|
||||
|
||||
add_compile_options()
|
||||
|
||||
# set the output path for `powershell.exe`
|
||||
set(EXECUTABLE_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/../Microsoft.PowerShell.ConsoleHost")
|
||||
|
||||
# set these flags, so build does static linking for msvcr120.dll
|
||||
# otherwise this dll need to be present on the system
|
||||
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
|
||||
|
||||
Reference in New Issue
Block a user