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:
Andrew Schwartzmeyer
2016-04-01 16:48:16 -07:00
parent bf470de5ca
commit 1293c63289
3 changed files with 7 additions and 1 deletions
-1
View File
@@ -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
View File
@@ -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")