diff options
| author | erw7 <erw7.github@gmail.com> | 2018-05-23 20:22:05 +0900 |
|---|---|---|
| committer | erw7 <erw7.github@gmail.com> | 2018-05-23 22:12:37 +0900 |
| commit | d337965e0951748fb91bf7c939b01e0f4779d8f0 (patch) | |
| tree | 79b8b88d4f37c9cc8dbb3f20fe9fe4d40992a9e8 | |
| parent | 655e3167eec6196c3e480b360cfb0b93094a3359 (diff) | |
| download | rneovim-d337965e0951748fb91bf7c939b01e0f4779d8f0.tar.gz rneovim-d337965e0951748fb91bf7c939b01e0f4779d8f0.tar.bz2 rneovim-d337965e0951748fb91bf7c939b01e0f4779d8f0.zip | |
Change to not use library prefix on MSVC
| -rw-r--r-- | cmake/FindLibUV.cmake | 6 | ||||
| -rw-r--r-- | third-party/cmake/LibuvCMakeLists.txt | 18 |
2 files changed, 7 insertions, 17 deletions
diff --git a/cmake/FindLibUV.cmake b/cmake/FindLibUV.cmake index 3a60a831ea..29eaf15b8e 100644 --- a/cmake/FindLibUV.cmake +++ b/cmake/FindLibUV.cmake @@ -31,11 +31,7 @@ if(LIBUV_USE_STATIC) "${CMAKE_STATIC_LIBRARY_PREFIX}uv${CMAKE_STATIC_LIBRARY_SUFFIX}") endif(LIBUV_USE_STATIC) -if(MSVC) - list(APPEND LIBUV_NAMES libuv) -else() - list(APPEND LIBUV_NAMES uv) -endif() +list(APPEND LIBUV_NAMES uv) find_library(LIBUV_LIBRARY NAMES ${LIBUV_NAMES} HINTS ${PC_LIBUV_LIBDIR} ${PC_LIBUV_LIBRARY_DIRS} diff --git a/third-party/cmake/LibuvCMakeLists.txt b/third-party/cmake/LibuvCMakeLists.txt index 35d6824df5..920d5cec07 100644 --- a/third-party/cmake/LibuvCMakeLists.txt +++ b/third-party/cmake/LibuvCMakeLists.txt @@ -4,18 +4,12 @@ project(libuv LANGUAGES C) file(GLOB UV_SOURCES_COMMON src/*.c) file(GLOB UV_SOURCES_WIN src/win/*.c) -if(MSVC) - set(LIBUV libuv) -else() - set(LIBUV uv) -endif() - -add_library(${LIBUV} ${UV_SOURCES_COMMON} ${UV_SOURCES_WIN}) -target_compile_definitions(${LIBUV} PRIVATE WIN32_LEAN_AND_MEAN "_WIN32_WINNT=0x0600") -target_link_libraries(${LIBUV} iphlpapi psapi shell32 userenv ws2_32) -target_include_directories(${LIBUV} PUBLIC ./include PRIVATE ./src) +add_library(uv ${UV_SOURCES_COMMON} ${UV_SOURCES_WIN}) +target_compile_definitions(uv PRIVATE WIN32_LEAN_AND_MEAN "_WIN32_WINNT=0x0600") +target_link_libraries(uv iphlpapi psapi shell32 userenv ws2_32) +target_include_directories(uv PUBLIC ./include PRIVATE ./src) if(BUILD_SHARED_LIBS) - set_target_properties(${LIBUV} PROPERTIES DEFINE_SYMBOL BUILDING_UV_SHARED) + set_target_properties(uv PROPERTIES DEFINE_SYMBOL BUILDING_UV_SHARED) endif() install(FILES @@ -28,7 +22,7 @@ install(FILES DESTINATION include) include(GNUInstallDirs) -install(TARGETS ${LIBUV} +install(TARGETS uv PUBLIC_HEADER ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} |