From cee864322a8b948b4c87238eac59dc964731d1e3 Mon Sep 17 00:00:00 2001 From: erw7 Date: Fri, 7 Dec 2018 12:36:21 +0900 Subject: [PATCH] [squash] Change name of import and static library on MSVC --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dfc16a78f0f..1d6758c0fb5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -380,9 +380,6 @@ target_compile_options(uv_shared PRIVATE ${uv_cflags}) target_include_directories(uv_shared PUBLIC include PRIVATE src) target_link_libraries(uv_shared ${uv_libraries}) set_target_properties(uv_shared PROPERTIES OUTPUT_NAME "uv") -if(MSVC AND LIBUV_ENABLE_STATIC) - set_target_properties(uv_shared PROPERTIES IMPORT_SUFFIX "_import.lib") -endif() add_library(uv_static STATIC ${uv_sources}) target_compile_definitions(uv_static PRIVATE ${uv_defines}) @@ -390,6 +387,9 @@ target_compile_options(uv_static PRIVATE ${uv_cflags}) target_include_directories(uv_static PUBLIC include PRIVATE src) target_link_libraries(uv_static ${uv_libraries}) set_target_properties(uv_static PROPERTIES OUTPUT_NAME "uv") +if(MSVC) + set_target_properties(uv_static PROPERTIES PREFIX "lib") +endif() option(libuv_buildtests "Build the unit tests when BUILD_TESTING is enabled." ON)