9d929469d2
# By Marc-André Moreau (27) and others # Via Marc-André Moreau * 'master' of git://github.com/awakecoding/FreeRDP: (48 commits) afreerdp: fix build on Android libwinpr-wtsapi: include wtsapi32.h on Windows wfreerdp: fix target exporting wfreerdp: fix building against OpenSSL with MONOLITHIC_BUILD and shared libraries wfreerdp: fix test build issues libwinpr-crypto: implement CryptProtectMemory/CryptUnprotectMemory libwinpr-memory: add missing definitions libwinpr-memory: start stubbing Increased size of stream on GCC conference create request from 512 to 1024. For large numbers of static virtual channels, the stream was being overflowed and was causing crashes. Fixes to process new command line options (autodetect, heartbeat, multitransport), join the MCS message channel and process auto-detect PDUs during the connection sequence. wfreerdp: fix build against static openssl library winpr-hash: fix building against openssl in static mode libfreerdp-gdi: fix invalidation of region with line drawing mfreerdp: fix hungarian keyboard '0' and 'i' key inversion Fixes build issue on Windows libwinpr-synch: add active/inactive linked list for timer queue libwinpr-synch: improve timer queue implementation libwinpr-synch: make use of head's expiration time in timer queue libwinpr-synch: make use of timespec for timer queue libwinpr-synch: improve timer queue implementation ... Conflicts: client/common/CMakeLists.txt
75 lines
2.3 KiB
CMake
75 lines
2.3 KiB
CMake
# FreeRDP: A Remote Desktop Protocol Implementation
|
|
# FreeRDP Client Common
|
|
#
|
|
# Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
set(MODULE_NAME "freerdp-client")
|
|
set(MODULE_PREFIX "FREERDP_CLIENT")
|
|
|
|
# Policy CMP0022: INTERFACE_LINK_LIBRARIES defines the link
|
|
# interface. Run "cmake --help-policy CMP0022" for policy details. Use the
|
|
# cmake_policy command to set the policy and suppress this warning.
|
|
if(POLICY CMP0022)
|
|
cmake_policy(SET CMP0022 NEW)
|
|
endif()
|
|
|
|
set(${MODULE_PREFIX}_SRCS
|
|
client.c
|
|
cmdline.c
|
|
compatibility.c
|
|
compatibility.h
|
|
file.c)
|
|
|
|
foreach(FREERDP_CHANNELS_CLIENT_SRC ${FREERDP_CHANNELS_CLIENT_SRCS})
|
|
get_filename_component(NINC ${FREERDP_CHANNELS_CLIENT_SRC} PATH)
|
|
include_directories(${NINC})
|
|
set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} "${FREERDP_CHANNELS_CLIENT_SRC}")
|
|
endforeach()
|
|
|
|
if(MSVC)
|
|
set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} module.def)
|
|
endif()
|
|
|
|
add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
|
|
|
|
include_directories(${OPENSSL_INCLUDE_DIR})
|
|
include_directories(${ZLIB_INCLUDE_DIRS})
|
|
|
|
set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
|
|
|
|
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS}
|
|
${FREERDP_CHANNELS_CLIENT_LIBS})
|
|
|
|
set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS MONOLITHIC ${MONOLITHIC_BUILD}
|
|
MODULE freerdp
|
|
MODULES freerdp-core)
|
|
|
|
set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS MONOLITHIC ${MONOLITHIC_BUILD}
|
|
MODULE winpr
|
|
MODULES winpr-crt winpr-utils)
|
|
|
|
|
|
|
|
target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
|
|
|
|
install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDPTargets)
|
|
|
|
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Client/Common")
|
|
|
|
if(BUILD_TESTING)
|
|
add_subdirectory(test)
|
|
endif()
|
|
|