5 files changed, 19 insertions, 11 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91c4568..09c6a1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,10 +20,14 @@ include(ECMPackageConfigHelpers)
 
 find_package(Qt5Core REQUIRED)
 find_package(FlatBuffers REQUIRED)
-function(generate_flatbuffers dest)
-    # TODO: move the file from ${fbs}_generated.h to just ${fbs}?
+function(generate_flatbuffers)
     foreach(fbs ${ARGN})
-       execute_process(COMMAND ${FLATBUFFERS_FLATC_EXECUTABLE} -c -b --gen-includes -o ${dest} ${CMAKE_CURRENT_SOURCE_DIR}/${fbs})
+       message("making ${CMAKE_CURRENT_BINARY_DIR}/${fbs}_generated.h from ${CMAKE_CURRENT_SOURCE_DIR}/${fbs}.fbs")
+       add_custom_command(
+              OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/${fbs}_generated.h
+              COMMAND ${FLATBUFFERS_FLATC_EXECUTABLE} -c -b --gen-includes -o ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${fbs}.fbs
+              DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${fbs}.fbs
+            )
     endforeach(fbs)
 endfunction(generate_flatbuffers)
 
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 186e3fe..859f707 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -2,13 +2,12 @@ project(toynadi_client)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
-set(common_path "../common/")
-
 set(toynadiclient_SRCS
-    ${common_path}/console.cpp
     main.cpp
     resourceaccess.cpp
 )
+
 add_executable(${PROJECT_NAME} ${toynadiclient_SRCS})
+target_link_libraries(${PROJECT_NAME} toynadicommon)
 qt5_use_modules(${PROJECT_NAME} Widgets Network)
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 2ceacf8..32e10f6 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -1 +1,9 @@
-add_subdirectory(commands)
+project(toynadicommon)
+generate_flatbuffers(commands/handshake)
+
+set(command_SRCS
+   console.cpp
+   ${CMAKE_CURRENT_BINARY_DIR}/commands/handshake_generated.h)
+
+add_library(${PROJECT_NAME} ${command_SRCS})
+qt5_use_modules(${PROJECT_NAME} Widgets)
diff --git a/common/commands/CMakeLists.txt b/common/commands/CMakeLists.txt
deleted file mode 100644
index 2a9ba64..0000000
--- a/common/commands/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-generate_flatbuffers(${CMAKE_CURRENT_BINARY_DIR} handshake.fbs)
diff --git a/resource/CMakeLists.txt b/resource/CMakeLists.txt
index 3de51b5..d74c705 100644
--- a/resource/CMakeLists.txt
+++ b/resource/CMakeLists.txt
@@ -2,14 +2,12 @@ project(toynadi_resource)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
-set(common_path "../common/")
-
 set(toynadiresource_SRCS
-    ${common_path}/console.cpp
     main.cpp
     listener.cpp
 )
 
 add_executable(${PROJECT_NAME} ${toynadiresource_SRCS})
+target_link_libraries(${PROJECT_NAME} toynadicommon)
 qt5_use_modules(${PROJECT_NAME} Widgets Network)
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)