diff options
author | Sedar Gokbulut <sedarg@microsoft.com> | 2017-01-10 16:54:16 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-10 16:54:16 -0800 |
commit | decdf7d5a2ad1b8163d5d6756a1c43a6a028f438 (patch) | |
tree | 1fc95d04ca806106d1e658f926c6c0e48bbc0f3c /src/corefx | |
parent | 2fc44782c783f363c1a98e0767f6fa65b5548c95 (diff) | |
download | coreclr-decdf7d5a2ad1b8163d5d6756a1c43a6a028f438.tar.gz coreclr-decdf7d5a2ad1b8163d5d6756a1c43a6a028f438.tar.bz2 coreclr-decdf7d5a2ad1b8163d5d6756a1c43a6a028f438.zip |
Add Microsoft.NETCore.Native package (2nd attempt) (#8882)
* 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
* Fixing the osx release build.
Diffstat (limited to 'src/corefx')
-rw-r--r-- | src/corefx/System.Globalization.Native/CMakeLists.txt | 16 |
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..9ecb0e08b9 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(TARGETS System.Globalization.Native_Static DESTINATION .) |