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

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

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

6
channels/CMakeLists.txt
View File

@ -209,10 +209,8 @@ 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 BUILTIN_CHANNELS)
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)
@ -249,10 +247,8 @@ 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 BUILTIN_CHANNELS)
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)
@ -286,10 +282,8 @@ 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 BUILTIN_CHANNELS)
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")

4
client/CMakeLists.txt
View File

@ -96,6 +96,4 @@ write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/FreeRDP-ClientConfi
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FreeRDP-ClientConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/FreeRDP-ClientConfigVersion.cmake install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FreeRDP-ClientConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/FreeRDP-ClientConfigVersion.cmake
DESTINATION ${FREERDP_CLIENT_CMAKE_INSTALL_DIR}) DESTINATION ${FREERDP_CLIENT_CMAKE_INSTALL_DIR})
if (NOT BUILTIN_CHANNELS) install(EXPORT FreeRDP-ClientTargets DESTINATION ${FREERDP_CLIENT_CMAKE_INSTALL_DIR})
install(EXPORT FreeRDP-ClientTargets DESTINATION ${FREERDP_CLIENT_CMAKE_INSTALL_DIR})
endif()