Export interface include directories

channels/CMakeLists.txt

@@ -162,6 +162,9 @@ endmacro(add_channel_client_subsystem)
 
 macro(channel_install _targets _destination _export_target)
 	if (NOT BUILD_SHARED_LIBS)
+		foreach(_target_name IN ITEMS ${_targets})
+			target_include_directories(${_target_name} INTERFACE $<INSTALL_INTERFACE:include>)
+		endforeach()
 		install(TARGETS ${_targets} DESTINATION ${_destination} EXPORT ${_export_target})
 	endif()
 endmacro(channel_install)

client/Windows/CMakeLists.txt

@@ -88,6 +88,7 @@ if(WITH_CLIENT_INTERFACE)
         set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
     endif()
     set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME ${MODULE_NAME}${FREERDP_API_VERSION})
+    target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
 else()
 	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} cli/wfreerdp.c cli/wfreerdp.h)
 	add_executable(${MODULE_NAME} ${WIN32_GUI_FLAG} ${${MODULE_PREFIX}_SRCS})

client/X11/CMakeLists.txt

@@ -94,6 +94,7 @@ if(WITH_CLIENT_INTERFACE)
 	else()
 		add_library(${PROJECT_NAME} ${SRCS})
 	endif()
+	target_include_directories(${PROJECT_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
 
 else()
 	list(APPEND SRCS

client/common/CMakeLists.txt

@@ -98,6 +98,7 @@ endif()
 
 list(APPEND LIBS freerdp winpr)
 
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
 target_link_libraries(${MODULE_NAME} PRIVATE ${FREERDP_CHANNELS_CLIENT_LIBS})
 target_link_libraries(${MODULE_NAME} PUBLIC ${LIBS})
 

libfreerdp/CMakeLists.txt

@@ -419,6 +419,7 @@ if (WITH_LIBRARY_VERSIONING)
     set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
 endif()
 
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
 target_link_libraries(${MODULE_NAME} PRIVATE ${LIBFREERDP_LIBS})
 if (LIBFREERDP_PUB_LIBS)
 	target_link_libraries(${MODULE_NAME} PUBLIC ${LIBFREERDP_PUB_LIBS} winpr)

rdtk/librdtk/CMakeLists.txt

@@ -56,6 +56,7 @@ add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
 list(APPEND ${MODULE_PREFIX}_LIBS winpr)
 
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
 target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS})
 
 set_target_properties(${MODULE_NAME} PROPERTIES LINKER_LANGUAGE C)

server/Windows/CMakeLists.txt

@@ -82,6 +82,7 @@ if(WITH_SERVER_INTERFACE)
     if (WITH_LIBRARY_VERSIONING)
         set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
     endif()
+    target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
 else()
 	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} cli/wfreerdp.c cli/wfreerdp.h)
 	add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})

server/common/CMakeLists.txt

@@ -60,6 +60,7 @@ if (WITH_LIBRARY_VERSIONING)
   set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
 endif()
 
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
 target_link_libraries(${MODULE_NAME} PRIVATE ${FREERDP_CHANNELS_SERVER_LIBS})
 target_link_libraries(${MODULE_NAME} PUBLIC winpr freerdp)
 

server/proxy/CMakeLists.txt

@@ -81,6 +81,7 @@ set(PUBLIC_LIBS
 	freerdp
 )
 
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
 target_link_libraries(${MODULE_NAME} PRIVATE ${PRIVATE_LIBS} PUBLIC ${PUBLIC_LIBS})
 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT server EXPORT FreeRDP-ProxyTargets)
 if (WITH_DEBUG_SYMBOLS AND MSVC)

server/shadow/CMakeLists.txt

@@ -91,6 +91,7 @@ list(APPEND LIBS
 	rdtk
 )
 
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
 target_link_libraries(${MODULE_NAME} PRIVATE ${LIBS})
 
 set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME ${MODULE_NAME}${FREERDP_VERSION_MAJOR})
@@ -148,6 +149,7 @@ list(APPEND LIBS
 	winpr
 )
 
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
 target_link_libraries(${MODULE_NAME} PRIVATE ${LIBS})
 
 set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME ${MODULE_NAME}${FREERDP_API_VERSION})

uwac/libuwac/CMakeLists.txt

@@ -77,6 +77,7 @@ if (WITH_LIBRARY_VERSIONING)
 	set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${UWAC_VERSION} SOVERSION ${UWAC_API_VERSION})
 endif()
 
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include/uwac${UWAC_API_VERSION}>)
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} PRIVATE ${WAYLAND_LIBS} ${XKBCOMMON_LIBS} ${EPOLLSHIM_LIBS})
 if (UWAC_HAVE_PIXMAN_REGION)
 	target_link_libraries(${MODULE_NAME} PRIVATE ${pixman_LINK_LIBRARIES})

winpr/libwinpr/CMakeLists.txt

@@ -179,6 +179,7 @@ else()
 endif()
 target_link_options(${MODULE_NAME} ${LINK_OPTS_MODE} ${WINPR_LINK_OPTIONS})
 target_include_directories(${MODULE_NAME} PRIVATE ${WINPR_INCLUDES})
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include/winpr${WINPR_VERSION_MAJOR}>)
 target_link_directories(${MODULE_NAME} PRIVATE ${WINPR_LINK_DIRS})
 target_compile_options(${MODULE_NAME} PRIVATE ${WINPR_COMPILE_OPTIONS})
 target_compile_definitions(${MODULE_NAME} PRIVATE ${WINPR_DEFINITIONS})

winpr/tools/CMakeLists.txt

@@ -110,6 +110,7 @@ if (WITH_LIBRARY_VERSIONING)
 endif()
 
 add_definitions(${WINPR_DEFINITIONS})
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include/winpr${WINPR_VERSION_MAJOR}>)
 target_link_libraries(${MODULE_NAME} PRIVATE ${WINPR_TOOLS_LIBS})
 
 install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT WinPRTargets