Moved generated tables.c to binary folder.

diff --git a/channels/client/CMakeLists.txt b/channels/client/CMakeLists.txt
index 6aa6077..fc42466 100644 (file)
--- a/channels/client/CMakeLists.txt
+++ b/channels/client/CMakeLists.txt
@@ -19,16 +19,16 @@ set(MODULE_NAME "freerdp-channels-client")
 set(MODULE_PREFIX "FREERDP_CHANNELS_CLIENT")
 
 set(${MODULE_PREFIX}_SRCS
-       tables.c
-       tables.h
-       addin.c
-       addin.h
-       init.c
-       init.h
-       open.c
-       open.h
-       channels.c
-       channels.h)
+       ${CMAKE_CURRENT_BINARY_DIR}/tables.c
+       ${CMAKE_CURRENT_SOURCE_DIR}/tables.h
+       ${CMAKE_CURRENT_SOURCE_DIR}/addin.c
+       ${CMAKE_CURRENT_SOURCE_DIR}/addin.h
+       ${CMAKE_CURRENT_SOURCE_DIR}/init.c
+       ${CMAKE_CURRENT_SOURCE_DIR}/init.h
+       ${CMAKE_CURRENT_SOURCE_DIR}/open.c
+       ${CMAKE_CURRENT_SOURCE_DIR}/open.h
+       ${CMAKE_CURRENT_SOURCE_DIR}/channels.c
+       ${CMAKE_CURRENT_SOURCE_DIR}/channels.h)
 
 list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES)
 
@@ -96,7 +96,7 @@ foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES})
 endforeach()
 set(CLIENT_STATIC_ADDIN_TABLE "${CLIENT_STATIC_ADDIN_TABLE}\n\t{ NULL, NULL, NULL }\n};")
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tables.c.in ${CMAKE_CURRENT_SOURCE_DIR}/tables.c)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tables.c.in ${CMAKE_CURRENT_BINARY_DIR}/tables.c)
 
 set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
        MONOLITHIC ${MONOLITHIC_BUILD}

diff --git a/client/common/CMakeLists.txt b/client/common/CMakeLists.txt
index 954f3a4..2b9841e 100644 (file)
--- a/client/common/CMakeLists.txt
+++ b/client/common/CMakeLists.txt
@@ -25,9 +25,10 @@ set(${MODULE_PREFIX}_SRCS
        compatibility.h
        file.c)
 
-set(FREERDP_CHANNELS_CLIENT_PATH "../../channels/client")
 foreach(FREERDP_CHANNELS_CLIENT_SRC ${FREERDP_CHANNELS_CLIENT_SRCS})
-       set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} "${FREERDP_CHANNELS_CLIENT_PATH}/${FREERDP_CHANNELS_CLIENT_SRC}")
+       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)