[freerdp] Update, cleanup + [libusb] Fix pc file

ports/freerdp/cmake-project-include.cmake

@@ -0,0 +1,21 @@
+find_package(PkgConfig REQUIRED)
+if(CHANNEL_URBDRC)
+    pkg_check_modules(vcpkg_libusb REQUIRED libusb-1.0)
+    set(LIBUSB_1_INCLUDE_DIR "${vcpkg_libusb_INCLUDE_DIRS}")
+    set(LIBUSB_1_LIBRARY "${vcpkg_libusb_LINK_LIBRARIES}")
+    string(REPLACE "-Wl,-framework," "-framework " libusb_frameworks "${vcpkg_libusb_LDFLAGS}")
+    list(FILTER libusb_frameworks INCLUDE REGEX "^-framework ")
+    list(APPEND LIBUSB_1_LIBRARY ${libusb_frameworks})
+endif()
+if(WITH_FFMPEG)
+    # Exact pkg_check_modules signature as in project
+    pkg_check_modules(AVCODEC libavcodec)
+    set(AVCODEC_LIBRARY "${AVCODEC_LINK_LIBRARIES}")
+    pkg_check_modules(AVUTIL libavutil)
+    set(AVUTIL_LIBRARY "${AVUTIL_LINK_LIBRARIES}")
+    string(REPLACE "-Wl,-framework," "-framework " avutil_frameworks "${AVUTIL_LDFLAGS}")
+    list(FILTER avutil_frameworks INCLUDE REGEX "^-framework ")
+    list(APPEND AVUTIL_LIBRARY ${avutil_frameworks})
+    pkg_check_modules(SWRESAMPLE libswresample)
+    set(SWRESAMPLE_LIBRARY "${SWRESAMPLE_LINK_LIBRARIES}")
+endif()

ports/freerdp/export-include.patch

@@ -0,0 +1,203 @@
+diff --git a/channels/CMakeLists.txt b/channels/CMakeLists.txt
+index 882fef7..4ae7737 100644
+--- a/channels/CMakeLists.txt
++++ b/channels/CMakeLists.txt
+@@ -213,6 +213,7 @@ macro(add_channel_client_library _module_prefix _module_name _channel_name _dyna
+       client_channel_install(${_module_name}  ${FREERDP_ADDIN_PATH})
+     endif()
+   endif()
++  target_include_directories(${_module_name} INTERFACE $<INSTALL_INTERFACE:include>)
+ endmacro(add_channel_client_library)
+
+ macro(add_channel_client_subsystem_library _module_prefix _module_name _channel_name _type _dynamic _entry)
+@@ -253,6 +254,7 @@ macro(add_channel_client_subsystem_library _module_prefix _module_name _channel_
+       client_channel_install(${_module_name}  ${FREERDP_ADDIN_PATH})
+     endif()
+   endif()
++  target_include_directories(${_module_name} INTERFACE $<INSTALL_INTERFACE:include>)
+ endmacro(add_channel_client_subsystem_library)
+
+ macro(add_channel_server_library _module_prefix _module_name _channel_name _dynamic _entry)
+@@ -290,6 +292,7 @@ macro(add_channel_server_library _module_prefix _module_name _channel_name _dyna
+ 			server_channel_install(${_module_name}  ${FREERDP_ADDIN_PATH})
+ 		endif()
+ 	endif()
++	target_include_directories(${_module_name} INTERFACE $<INSTALL_INTERFACE:include>)
+ endmacro(add_channel_server_library)
+
+ set(FILENAME "ChannelOptions.cmake")
+diff --git a/channels/server/CMakeLists.txt b/channels/server/CMakeLists.txt
+index 1f49c3b..67d361f 100644
+--- a/channels/server/CMakeLists.txt
++++ b/channels/server/CMakeLists.txt
+@@ -29,6 +29,7 @@ foreach(STATIC_MODULE ${CHANNEL_STATIC_SERVER_MODULES})
+ endforeach()
+
+ add_library(${MODULE_NAME} STATIC ${${MODULE_PREFIX}_SRCS})
++target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
+
+ if (WITH_LIBRARY_VERSIONING)
+   set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
+diff --git a/client/Android/CMakeLists.txt b/client/Android/CMakeLists.txt
+index b3473a9..5537033 100644
+--- a/client/Android/CMakeLists.txt
++++ b/client/Android/CMakeLists.txt
+@@ -51,4 +51,5 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} jnigraphics)
+ #set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME ${MODULE_NAME}${FREERDP_API_VERSION})
+
+ target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
++target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
+ install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT AndroidTargets)
+diff --git a/client/Mac/CMakeLists.txt b/client/Mac/CMakeLists.txt
+index b3eb591..f6f756b 100644
+--- a/client/Mac/CMakeLists.txt
++++ b/client/Mac/CMakeLists.txt
+@@ -95,6 +95,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${EXTRA_LIBS} freerdp-client)
+ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp)
+
+ target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
++target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
+
+ # Set a list of the dependent targets used by the application. There should be a way to get this list automatically
+ # from cmake, but for now I put it down manually. I got the references by calling "otool -L MacFreeRDP-client"
+diff --git a/client/Windows/CMakeLists.txt b/client/Windows/CMakeLists.txt
+index b0a5d27..278b0fc 100644
+--- a/client/Windows/CMakeLists.txt
++++ b/client/Windows/CMakeLists.txt
+@@ -80,6 +80,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-client)
+ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp)
+ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} msimg32)
+ target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
++target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
+
+ if(WITH_CLIENT_INTERFACE)
+ 	install(TARGETS ${MODULE_NAME} COMPONENT libraries)
+diff --git a/client/X11/CMakeLists.txt b/client/X11/CMakeLists.txt
+index 869652c..d170277 100644
+--- a/client/X11/CMakeLists.txt
++++ b/client/X11/CMakeLists.txt
+@@ -238,6 +238,8 @@ if(WITH_IPP)
+     target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${IPP_LIBRARY_LIST})
+ endif()
+
++target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
++
+ if(WITH_CLIENT_INTERFACE)
+ 	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
+ 	add_subdirectory(cli)
+diff --git a/client/common/CMakeLists.txt b/client/common/CMakeLists.txt
+index 1de7461..acb6ecf 100644
+--- a/client/common/CMakeLists.txt
++++ b/client/common/CMakeLists.txt
+@@ -77,6 +77,7 @@ else()
+ 	target_link_libraries(${MODULE_NAME} ${PUBLIC_KEYWORD} ${${MODULE_PREFIX}_LIBS})
+ endif()
+
++target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
+
+ install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT FreeRDP-ClientTargets)
+
+diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt
+index 7e9a63d..b9b0ab0 100644
+--- a/libfreerdp/CMakeLists.txt
++++ b/libfreerdp/CMakeLists.txt
+@@ -395,6 +395,7 @@ endif()
+
+
+ target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${LIBFREERDP_LIBS} winpr)
++target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
+
+ install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT FreeRDPTargets)
+ if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
+diff --git a/rdtk/librdtk/CMakeLists.txt b/rdtk/librdtk/CMakeLists.txt
+index 000e6d2..a84ce5e 100644
+--- a/rdtk/librdtk/CMakeLists.txt
++++ b/rdtk/librdtk/CMakeLists.txt
+@@ -42,6 +42,7 @@ list(APPEND ${MODULE_PREFIX}_LIBS winpr)
+ list(APPEND ${MODULE_PREFIX}_LIBS freerdp)
+
+ target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${${MODULE_PREFIX}_LIBS})
++target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
+
+ set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "RdTk")
+
+diff --git a/server/Windows/CMakeLists.txt b/server/Windows/CMakeLists.txt
+index 4086542..976bd86 100644
+--- a/server/Windows/CMakeLists.txt
++++ b/server/Windows/CMakeLists.txt
+@@ -96,6 +96,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} dsound)
+ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-server freerdp)
+
+ target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
++target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
+
+ if(WITH_SERVER_INTERFACE)
+ 	install(TARGETS ${MODULE_NAME} COMPONENT libraries)
+diff --git a/server/common/CMakeLists.txt b/server/common/CMakeLists.txt
+index 7c533b7..8503928 100644
+--- a/server/common/CMakeLists.txt
++++ b/server/common/CMakeLists.txt
+@@ -62,6 +62,7 @@ endif()
+
+ target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${FREERDP_CHANNELS_SERVER_LIBS})
+ target_link_libraries(${MODULE_NAME} ${PUBLIC_KEYWORD} winpr freerdp)
++target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
+
+ install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT FreeRDP-ServerTargets)
+ if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
+diff --git a/server/shadow/CMakeLists.txt b/server/shadow/CMakeLists.txt
+index 0daa245..583c0a4 100644
+--- a/server/shadow/CMakeLists.txt
++++ b/server/shadow/CMakeLists.txt
+@@ -80,6 +80,7 @@ list(APPEND ${MODULE_PREFIX}_LIBS winpr-tools)
+ list(APPEND ${MODULE_PREFIX}_LIBS rdtk)
+
+ target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${${MODULE_PREFIX}_LIBS})
++target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
+
+ set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME ${MODULE_NAME}${FREERDP_VERSION_MAJOR})
+ if (WITH_LIBRARY_VERSIONING)
+@@ -285,6 +286,7 @@ add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
+ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-shadow freerdp winpr)
+
+ target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${${MODULE_PREFIX}_LIBS})
++target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
+
+ set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME ${MODULE_NAME}${FREERDP_API_VERSION})
+ if (WITH_LIBRARY_VERSIONING)
+diff --git a/uwac/libuwac/CMakeLists.txt b/uwac/libuwac/CMakeLists.txt
+index f66a8c4..ea08bed 100644
+--- a/uwac/libuwac/CMakeLists.txt
++++ b/uwac/libuwac/CMakeLists.txt
+@@ -81,6 +81,7 @@ if (HAVE_PIXMAN_REGION)
+ else()
+ 	target_link_libraries(${MODULE_NAME} PRIVATE freerdp)
+ endif()
++target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include/uwac0>)
+
+ install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT uwac)
+
+diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt
+index 2616439..1f4688e 100644
+--- a/winpr/libwinpr/CMakeLists.txt
++++ b/winpr/libwinpr/CMakeLists.txt
+@@ -144,6 +144,7 @@ endif()
+
+ add_definitions(${WINPR_DEFINITIONS})
+ target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${WINPR_LIBS_PRIVATE} ${PUBLIC_KEYWORD} ${WINPR_LIBS_PUBLIC})
++target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
+ install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT WinPRTargets)
+ if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
+     get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
+diff --git a/winpr/tools/CMakeLists.txt b/winpr/tools/CMakeLists.txt
+index 13f4c13..4a73333 100644
+--- a/winpr/tools/CMakeLists.txt
++++ b/winpr/tools/CMakeLists.txt
+@@ -111,6 +111,7 @@ endif()
+
+ add_definitions(${WINPR_DEFINITIONS})
+ target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${WINPR_TOOLS_LIBS})
++target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
+
+ install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT WinPRTargets)
+ if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)

ports/freerdp/find-dependency.patch

@@ -0,0 +1,44 @@
+diff --git a/client/FreeRDP-ClientConfig.cmake.in b/client/FreeRDP-ClientConfig.cmake.in
+index 779374c..35b74c1 100644
+--- a/client/FreeRDP-ClientConfig.cmake.in
++++ b/client/FreeRDP-ClientConfig.cmake.in
+@@ -1,3 +1,6 @@
++include(CMakeFindDependencyMacro)
++find_dependency(WinPR @FREERDP_VERSION@)
++find_dependency(FreeRDP @FREERDP_VERSION@)
+
+ @PACKAGE_INIT@
+
+diff --git a/libfreerdp/FreeRDPConfig.cmake.in b/libfreerdp/FreeRDPConfig.cmake.in
+index a2321e7..4c8379e 100644
+--- a/libfreerdp/FreeRDPConfig.cmake.in
++++ b/libfreerdp/FreeRDPConfig.cmake.in
+@@ -1,3 +1,5 @@
++include(CMakeFindDependencyMacro)
++find_dependency(WinPR @FREERDP_VERSION@)
+
+ @PACKAGE_INIT@
+
+diff --git a/server/FreeRDP-ServerConfig.cmake.in b/server/FreeRDP-ServerConfig.cmake.in
+index b9edb55..db7cb44 100644
+--- a/server/FreeRDP-ServerConfig.cmake.in
++++ b/server/FreeRDP-ServerConfig.cmake.in
+@@ -1,3 +1,6 @@
++include(CMakeFindDependencyMacro)
++find_dependency(WinPR @FREERDP_VERSION@)
++find_dependency(FreeRDP @FREERDP_VERSION@)
+
+ @PACKAGE_INIT@
+
+diff --git a/server/shadow/FreeRDP-ShadowConfig.cmake.in b/server/shadow/FreeRDP-ShadowConfig.cmake.in
+index 1eb11e0..9b6f24c 100644
+--- a/server/shadow/FreeRDP-ShadowConfig.cmake.in
++++ b/server/shadow/FreeRDP-ShadowConfig.cmake.in
+@@ -1,3 +1,7 @@
++include(CMakeFindDependencyMacro)
++find_dependency(WinPR @FREERDP_VERSION@)
++find_dependency(FreeRDP @FREERDP_VERSION@)
++find_dependency(FreeRDP-Server @FREERDP_VERSION@)
+
+ @PACKAGE_INIT@
+

ports/freerdp/fix-install-destination.patch

@@ -0,0 +1,127 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8894a58..d2f8b2f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -960,6 +960,9 @@ else()
+ 	set(FREERDP_LIBRARY_PATH "${CMAKE_INSTALL_LIBDIR}")
+ 	set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/freerdp${FREERDP_VERSION_MAJOR}")
+ endif()
++set(FREERDP_DATA_PATH "share/freerdp")
++set(FREERDP_LIBRARY_PATH "${CMAKE_INSTALL_LIBDIR}")
++set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/freerdp${FREERDP_VERSION_MAJOR}")
+ set(FREERDP_ADDIN_PATH "${FREERDP_PLUGIN_PATH}")
+
+ # Path to put extensions
+diff --git a/client/Windows/CMakeLists.txt b/client/Windows/CMakeLists.txt
+index 6274571..b0a5d27 100644
+--- a/client/Windows/CMakeLists.txt
++++ b/client/Windows/CMakeLists.txt
+@@ -82,7 +82,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} msimg32)
+ target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
+
+ if(WITH_CLIENT_INTERFACE)
+-	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
++	install(TARGETS ${MODULE_NAME} COMPONENT libraries)
+ 	if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
+ 		install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
+ 	endif()
+diff --git a/client/common/CMakeLists.txt b/client/common/CMakeLists.txt
+index b465a63..1de7461 100644
+--- a/client/common/CMakeLists.txt
++++ b/client/common/CMakeLists.txt
+@@ -78,7 +78,7 @@ else()
+ endif()
+
+
+-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDP-ClientTargets)
++install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT FreeRDP-ClientTargets)
+
+ if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
+ 	get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
+diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt
+index a259b68..10a0921 100644
+--- a/libfreerdp/CMakeLists.txt
++++ b/libfreerdp/CMakeLists.txt
+@@ -396,7 +396,7 @@ endif()
+
+ target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${LIBFREERDP_LIBS} winpr)
+
+-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDPTargets)
++install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT FreeRDPTargets)
+ if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
+     get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
+     install(FILES ${CMAKE_PDB_BINARY_DIR}/${OUTPUT_FILENAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
+diff --git a/server/Windows/CMakeLists.txt b/server/Windows/CMakeLists.txt
+index c7833ad..4086542 100644
+--- a/server/Windows/CMakeLists.txt
++++ b/server/Windows/CMakeLists.txt
+@@ -98,7 +98,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-server freerdp)
+ target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
+
+ if(WITH_SERVER_INTERFACE)
+-	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
++	install(TARGETS ${MODULE_NAME} COMPONENT libraries)
+
+ 	if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
+ 		install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
+diff --git a/server/common/CMakeLists.txt b/server/common/CMakeLists.txt
+index c94a209..7c533b7 100644
+--- a/server/common/CMakeLists.txt
++++ b/server/common/CMakeLists.txt
+@@ -63,7 +63,7 @@ endif()
+ target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${FREERDP_CHANNELS_SERVER_LIBS})
+ target_link_libraries(${MODULE_NAME} ${PUBLIC_KEYWORD} winpr freerdp)
+
+-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDP-ServerTargets)
++install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT FreeRDP-ServerTargets)
+ if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
+     get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
+     install(FILES ${CMAKE_PDB_BINARY_DIR}/${OUTPUT_FILENAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
+diff --git a/server/shadow/CMakeLists.txt b/server/shadow/CMakeLists.txt
+index 3e0df0b..0daa245 100644
+--- a/server/shadow/CMakeLists.txt
++++ b/server/shadow/CMakeLists.txt
+@@ -86,7 +86,7 @@ if (WITH_LIBRARY_VERSIONING)
+ 	  set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
+ endif()
+
+-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT server EXPORT FreeRDP-ShadowTargets)
++install(TARGETS ${MODULE_NAME} COMPONENT server EXPORT FreeRDP-ShadowTargets)
+
+ if (WITH_DEBUG_SYMBOLS AND MSVC)
+ 	get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
+@@ -291,7 +291,7 @@ if (WITH_LIBRARY_VERSIONING)
+ 	set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
+ endif()
+
+-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT server EXPORT FreeRDP-ShadowTargets)
++install(TARGETS ${MODULE_NAME} COMPONENT server EXPORT FreeRDP-ShadowTargets)
+
+ if (WITH_DEBUG_SYMBOLS AND MSVC)
+ 	get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
+diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt
+index 2df8d89..da23a1b 100644
+--- a/winpr/libwinpr/CMakeLists.txt
++++ b/winpr/libwinpr/CMakeLists.txt
+@@ -144,7 +144,7 @@ endif()
+
+ add_definitions(${WINPR_DEFINITIONS})
+ target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${WINPR_LIBS_PRIVATE} ${PUBLIC_KEYWORD} ${WINPR_LIBS_PUBLIC})
+-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT WinPRTargets)
++install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT WinPRTargets)
+ if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
+     get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
+     install(FILES ${CMAKE_PDB_BINARY_DIR}/${OUTPUT_FILENAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
+diff --git a/winpr/tools/CMakeLists.txt b/winpr/tools/CMakeLists.txt
+index 0ddf9fb..b89a954 100644
+--- a/winpr/tools/CMakeLists.txt
++++ b/winpr/tools/CMakeLists.txt
+@@ -112,7 +112,7 @@ endif()
+ add_definitions(${WINPR_DEFINITIONS})
+ target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${WINPR_TOOLS_LIBS})
+
+-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT WinPRTargets)
++install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT WinPRTargets)
+ if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
+     get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
+     install(FILES ${CMAKE_PDB_BINARY_DIR}/${OUTPUT_FILENAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)