github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

client/X11: fix build without client interface

Browse Source 
Fix build when -DWITH_CLIENT_INTERFACE=OFF is used.
This commit is contained in:
Bernhard Miklautz 2016-05-03 10:44:42 +02:00
parent a7ca42ec17
commit 8cb873b054
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/X11/CMakeLists.txt
View File

@ -56,17 +56,18 @@ set(${MODULE_PREFIX}_SRCS
if(WITH_CLIENT_INTERFACE) if(WITH_CLIENT_INTERFACE)
if(CLIENT_INTERFACE_SHARED) if(CLIENT_INTERFACE_SHARED)
add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS}) add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
if (WITH_LIBRARY_VERSIONING)
set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
endif()
else() else()
add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
endif() endif()
if (WITH_LIBRARY_VERSIONING)
set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
endif()
else() else()
set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} cli/xfreerdp.c cli/xfreerdp.h) set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} cli/xfreerdp.c xfreerdp.h)
add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp") set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp")
include_directories(..)
endif() endif()
set(${MODULE_PREFIX}_LIBS set(${MODULE_PREFIX}_LIBS

2
client/X11/cli/CMakeLists.txt
View File

@ -18,8 +18,6 @@
set(MODULE_NAME "xfreerdp-cli") set(MODULE_NAME "xfreerdp-cli")
set(MODULE_PREFIX "FREERDP_CLIENT_X11") set(MODULE_PREFIX "FREERDP_CLIENT_X11")
include_directories(..)
set(${MODULE_PREFIX}_SRCS set(${MODULE_PREFIX}_SRCS
xfreerdp.c) xfreerdp.c)

4
client/X11/cli/xfreerdp.c
View File

@ -29,8 +29,8 @@
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>
#include <freerdp/client/cmdline.h> #include <freerdp/client/cmdline.h>
#include "xf_client.h" #include "../xf_client.h"
#include "xfreerdp.h" #include "../xfreerdp.h"
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {