From 3ed391ab13934e12de9d96bae613e8fb84ef0188 Mon Sep 17 00:00:00 2001
From: Michele Caini <michele.caini@gmail.com>
Date: Sun, 9 May 2021 23:59:21 +0200
Subject: [PATCH] updated build system

---
 src/CMakeLists.txt | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6e401ee7..414f6c3c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -58,7 +58,7 @@ function(add_uvw_library LIB_NAME)
 endfunction()
 
 # 
-# Build libraries
+# Build and install libraries
 #
 
 if (BUILD_UVW_SHARED_LIB)
@@ -66,22 +66,25 @@ if (BUILD_UVW_SHARED_LIB)
     add_library(uvw::uvw-shared ALIAS uvw-shared)
     target_link_libraries(uvw-shared PUBLIC $<$<TARGET_EXISTS:uv::uv-shared>:uv::uv-shared>)
     set_target_properties(uvw-shared PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
+
     add_uvw_library(uvw-shared)
+
+    install(TARGETS uvw-shared EXPORT uvw ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+    if(FETCH_LIBUV)
+        install(TARGETS uv_a EXPORT uvw ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    endif()
 else()
     add_library(uvw-static STATIC)
     add_library(uvw::uvw-static ALIAS uvw-static)
     target_link_libraries(uvw-static PUBLIC $<$<TARGET_EXISTS:uv::uv-static>:uv::uv-static> $<$<NOT:$<TARGET_EXISTS:uv::uv-static>>:uv_a dl>)
     set_target_properties(uvw-static PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
+
     add_uvw_library(uvw-static)
+
+    install(TARGETS uvw-static EXPORT uvw ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+    if(FETCH_LIBUV)
+        install(TARGETS uv EXPORT uvw LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    endif()
 endif()
-
-#
-# Install targets
-#
-
-install(EXPORT uvw NAMESPACE uvw:: DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(TARGETS uvw-static EXPORT uvw ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-if(FETCH_LIBUV)
-    install(TARGETS uv_a EXPORT uvw ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-    install(TARGETS uv EXPORT uvw LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-endif(FETCH_LIBUV)