luo980/uvw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use directly pkg-config target

Browse Source 
PkgConfig cmake module can provide target itself. Use that instead of
preparing its own. Add dependency to built libraries if libuv was found,
it would propagate to uvw installation. It would still require
find_package(libuv) on downstream builds.
This commit is contained in:
Petr Menšík 2022-01-11 14:01:57 +01:00
parent 6463fffaa9
commit c83d14a54a
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -109,12 +109,9 @@ function(use_libuv)
else(libuv_FOUND)
find_package(PkgConfig QUIET)
if (PkgConfig_FOUND)
pkg_check_modules(libuv libuv>=${LIBUV_VERSION})
pkg_check_modules(libuv IMPORTED_TARGET libuv>=${LIBUV_VERSION})
if (libuv_FOUND)
add_library(uv INTERFACE)
target_include_directories(uv PUBLIC ${libuv_INCLUDE_DIRS})
target_link_libraries(uv INTERFACE ${libuv_LDFLAGS} ${libuv_LIBRARIES})
add_library(uv::uv-shared ALIAS uv)
add_library(uv::uv-shared ALIAS PkgConfig::libuv)
set(FETCH_LIBUV_DEFAULT OFF)
message(STATUS "libuv ${libuv_VERSION} found via pkg-config")
endif(libuv_FOUND)

4
src/CMakeLists.txt
View File

@ -65,14 +65,14 @@ if (BUILD_UVW_SHARED_LIB)
add_library(uvw SHARED)
add_library(uvw::uvw-shared ALIAS uvw)
# If libuv is not fetched by ourselves, it's the caller's responsibility to make sure of the linkage.
if(FETCH_LIBUV)
if(FETCH_LIBUV OR libuv_FOUND)
target_link_libraries(uvw PUBLIC uv::uv-shared)
endif()
else()
add_library(uvw STATIC)
add_library(uvw::uvw-static ALIAS uvw)
# If libuv is not fetched by ourselves, it's the caller's responsibility to make sure of the linkage.
if(FETCH_LIBUV)
if(FETCH_LIBUV OR libuv_FOUND)
target_link_libraries(uvw PUBLIC uv::uv-static)
endif()
endif()