mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-16 15:49:01 +08:00
fb2006edf9
* Adding a port for nethost * Fixing ref, removing unneeded include, and marking unsupported architectures for nethost * Fixing the expected sha512 for nethost * Setting nethost to fail on static and uwp * Removing an unecessary file(REMOVE_RECURSE) from nethost * update baseline * [nethost] Update to latest from dotnet/runtime * [vcpkg-baseline] Update baseline for nethost * [vcpkg-baseline] Update baseline for nethost Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
59 lines
1.9 KiB
Diff
59 lines
1.9 KiB
Diff
diff --git a/src/installer/corehost/cli/common.cmake b/src/installer/corehost/cli/common.cmake
|
|
index 63e7306..639c90e 100644
|
|
--- a/src/installer/corehost/cli/common.cmake
|
|
+++ b/src/installer/corehost/cli/common.cmake
|
|
@@ -5,9 +5,6 @@
|
|
project(${DOTNET_PROJECT_NAME})
|
|
|
|
if(WIN32)
|
|
- add_compile_options($<$<CONFIG:RelWithDebInfo>:/MT>)
|
|
- add_compile_options($<$<CONFIG:Release>:/MT>)
|
|
- add_compile_options($<$<CONFIG:Debug>:/MTd>)
|
|
else()
|
|
add_compile_options(-fvisibility=hidden)
|
|
endif()
|
|
diff --git a/src/installer/corehost/cli/nethost/CMakeLists.txt b/src/installer/corehost/cli/nethost/CMakeLists.txt
|
|
index 7473958..49c664f 100644
|
|
--- a/src/installer/corehost/cli/nethost/CMakeLists.txt
|
|
+++ b/src/installer/corehost/cli/nethost/CMakeLists.txt
|
|
@@ -2,12 +2,14 @@
|
|
# The .NET Foundation licenses this file to you under the MIT license.
|
|
# See the LICENSE file in the project root for more information.
|
|
|
|
-cmake_minimum_required (VERSION 2.6)
|
|
+cmake_minimum_required (VERSION 3.14)
|
|
project(nethost)
|
|
|
|
set(DOTNET_PROJECT_NAME "nethost")
|
|
|
|
# Include directories
|
|
+include(../../../settings.cmake)
|
|
+include(../../../functions.cmake)
|
|
include_directories(../fxr)
|
|
|
|
# CMake does not recommend using globbing since it messes with the freshness checks
|
|
@@ -22,13 +24,18 @@ if(WIN32)
|
|
Exports.def)
|
|
endif()
|
|
|
|
+if(BUILD_SHARED_LIBS)
|
|
include(../lib.cmake)
|
|
+else()
|
|
include(../lib_static.cmake)
|
|
+endif()
|
|
|
|
add_definitions(-DFEATURE_LIBHOST=1)
|
|
add_definitions(-DNETHOST_EXPORT)
|
|
|
|
-install(FILES nethost.h DESTINATION corehost)
|
|
-install(TARGETS nethost DESTINATION corehost)
|
|
-install(TARGETS libnethost DESTINATION corehost)
|
|
-install_symbols(nethost corehost)
|
|
\ No newline at end of file
|
|
+install(FILES nethost.h ../coreclr_delegates.h ../hostfxr.h DESTINATION include)
|
|
+if(BUILD_SHARED_LIBS)
|
|
+install(TARGETS nethost)
|
|
+else()
|
|
+install(TARGETS libnethost)
|
|
+endif()
|