client/X11: fix build without client interface

Fix build when -DWITH_CLIENT_INTERFACE=OFF is used.

diff --git a/client/X11/CMakeLists.txt b/client/X11/CMakeLists.txt
index 046078d..82e7f2e 100644 (file)
--- a/client/X11/CMakeLists.txt
+++ b/client/X11/CMakeLists.txt
@@ -56,17 +56,18 @@ set(${MODULE_PREFIX}_SRCS
 if(WITH_CLIENT_INTERFACE)
        if(CLIENT_INTERFACE_SHARED)
                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()
                add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
        endif()
-  if (WITH_LIBRARY_VERSIONING)
-         set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
-  endif()
   
 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})
        set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp")
+       include_directories(..)
 endif()
 
 set(${MODULE_PREFIX}_LIBS

diff --git a/client/X11/cli/CMakeLists.txt b/client/X11/cli/CMakeLists.txt
index d90ff71..5f805c2 100644 (file)
--- a/client/X11/cli/CMakeLists.txt
+++ b/client/X11/cli/CMakeLists.txt
@@ -18,8 +18,6 @@
 set(MODULE_NAME "xfreerdp-cli")
 set(MODULE_PREFIX "FREERDP_CLIENT_X11")
 
-include_directories(..)
-
 set(${MODULE_PREFIX}_SRCS
        xfreerdp.c)
 

diff --git a/client/X11/cli/xfreerdp.c b/client/X11/cli/xfreerdp.c
index 22ab3ce..663d49b 100644 (file)
--- a/client/X11/cli/xfreerdp.c
+++ b/client/X11/cli/xfreerdp.c
@@ -29,8 +29,8 @@
 #include <freerdp/freerdp.h>
 #include <freerdp/client/cmdline.h>
 
-#include "xf_client.h"
-#include "xfreerdp.h"
+#include "../xf_client.h"
+#include "../xfreerdp.h"
 
 int main(int argc, char* argv[])
 {