mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed installation of FreeRDP-ClientTargets.cmake (#7117)

Browse Source
This commit is contained in:
akallabeth 2021-06-24 11:21:44 +02:00 committed by GitHub
parent 184506db4a
commit 0733dd3743
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
channels/CMakeLists.txt
View File

@ -163,7 +163,9 @@ macro(add_channel_client_subsystem _channel_prefix _channel_name _subsystem _typ
endmacro(add_channel_client_subsystem) endmacro(add_channel_client_subsystem)
macro(channel_install _targets _destination _export_target) macro(channel_install _targets _destination _export_target)
if (NOT BUILTIN_CHANNELS OR NOT BUILD_SHARED_LIBS)
install(TARGETS ${_targets} DESTINATION ${_destination} EXPORT ${_export_target}) install(TARGETS ${_targets} DESTINATION ${_destination} EXPORT ${_export_target})
endif()
endmacro(channel_install) endmacro(channel_install)
macro(server_channel_install _targets _destination) macro(server_channel_install _targets _destination)
@ -209,8 +211,10 @@ macro(add_channel_client_library _module_prefix _module_name _channel_name _dyna
add_library(${_module_name} STATIC ${${_module_prefix}_SRCS}) add_library(${_module_name} STATIC ${${_module_prefix}_SRCS})
target_link_libraries(${_module_name} ${${_module_prefix}_LIBS}) target_link_libraries(${_module_name} ${${_module_prefix}_LIBS})
if (NOT BUILD_SHARED_LIBS)
client_channel_install(${_module_name} ${FREERDP_ADDIN_PATH}) client_channel_install(${_module_name} ${FREERDP_ADDIN_PATH})
endif() endif()
endif()
endmacro(add_channel_client_library) endmacro(add_channel_client_library)
macro(add_channel_client_subsystem_library _module_prefix _module_name _channel_name _type _dynamic _entry) macro(add_channel_client_subsystem_library _module_prefix _module_name _channel_name _type _dynamic _entry)
@ -247,8 +251,10 @@ macro(add_channel_client_subsystem_library _module_prefix _module_name _channel_
add_library(${_module_name} STATIC ${${_module_prefix}_SRCS}) add_library(${_module_name} STATIC ${${_module_prefix}_SRCS})
target_link_libraries(${_module_name} ${${_module_prefix}_LIBS}) target_link_libraries(${_module_name} ${${_module_prefix}_LIBS})
if (NOT BUILD_SHARED_LIBS)
client_channel_install(${_module_name} ${FREERDP_ADDIN_PATH}) client_channel_install(${_module_name} ${FREERDP_ADDIN_PATH})
endif() endif()
endif()
endmacro(add_channel_client_subsystem_library) endmacro(add_channel_client_subsystem_library)
macro(add_channel_server_library _module_prefix _module_name _channel_name _dynamic _entry) macro(add_channel_server_library _module_prefix _module_name _channel_name _dynamic _entry)
@ -282,8 +288,10 @@ macro(add_channel_server_library _module_prefix _module_name _channel_name _dyna
set(${_module_prefix}_CHANNEL ${_channel_name} PARENT_SCOPE) set(${_module_prefix}_CHANNEL ${_channel_name} PARENT_SCOPE)
set(${_module_prefix}_ENTRY ${_entry} PARENT_SCOPE) set(${_module_prefix}_ENTRY ${_entry} PARENT_SCOPE)
add_library(${_module_name} STATIC ${${_module_prefix}_SRCS}) add_library(${_module_name} STATIC ${${_module_prefix}_SRCS})
if (NOT BUILD_SHARED_LIBS)
server_channel_install(${_module_name} ${FREERDP_ADDIN_PATH}) server_channel_install(${_module_name} ${FREERDP_ADDIN_PATH})
endif() endif()
endif()
endmacro(add_channel_server_library) endmacro(add_channel_server_library)
set(FILENAME "ChannelOptions.cmake") set(FILENAME "ChannelOptions.cmake")