summaryrefslogtreecommitdiff
path: root/src/corefx
diff options
context:
space:
mode:
authorSedar Gokbulut <sedarg@microsoft.com>2017-01-04 11:21:20 -0800
committerGitHub <noreply@github.com>2017-01-04 11:21:20 -0800
commiteea7b4691c0a489435814e48a257a9d047475006 (patch)
treef2a41fcb9ac19d79fef1079cb821940eef26cc27 /src/corefx
parent4b93ba94828c879356ef9dd3246397cee3431e2e (diff)
downloadcoreclr-eea7b4691c0a489435814e48a257a9d047475006.tar.gz
coreclr-eea7b4691c0a489435814e48a257a9d047475006.tar.bz2
coreclr-eea7b4691c0a489435814e48a257a9d047475006.zip
Adding Microsoft.NETCore.Native package (#8791)
* "Adding Microsoft.NETCore.Native package" * Adding generic linux configuration to Microsoft.NETCore.Native package * Fixing the OSX pkgproj of Microsoft.NETCore.Native to include S.Globalization.Native.dylib and not .so
Diffstat (limited to 'src/corefx')
-rw-r--r--src/corefx/System.Globalization.Native/CMakeLists.txt16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/corefx/System.Globalization.Native/CMakeLists.txt b/src/corefx/System.Globalization.Native/CMakeLists.txt
index 90f50671cd..3c5c6a00a6 100644
--- a/src/corefx/System.Globalization.Native/CMakeLists.txt
+++ b/src/corefx/System.Globalization.Native/CMakeLists.txt
@@ -67,6 +67,14 @@ _add_library(System.Globalization.Native
${NATIVEGLOBALIZATION_SOURCES}
)
+_add_library(System.Globalization.Native_Static
+ STATIC
+ ${NATIVEGLOBALIZATION_SOURCES}
+)
+
+# Remove the _Static postfix from the static library name
+set_target_properties(System.Globalization.Native_Static PROPERTIES OUTPUT_NAME System.Globalization.Native)
+
# Disable the "lib" prefix.
set_target_properties(System.Globalization.Native PROPERTIES PREFIX "")
@@ -80,10 +88,17 @@ if(NOT CLR_CMAKE_PLATFORM_DARWIN)
${ICUUC}
${ICUI18N}
)
+ target_link_libraries(System.Globalization.Native_Static
+ ${ICUUC}
+ ${ICUI18N}
+ )
elseif(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD)
target_link_libraries(System.Globalization.Native
dl
)
+ target_link_libraries(System.Globalization.Native_Static
+ dl
+ )
endif()
else()
target_link_libraries(System.Globalization.Native
@@ -100,4 +115,5 @@ verify_dependencies(
# add the install targets
install_clr(System.Globalization.Native)
+install_clr(System.Globalization.Native_Static)