From 9a47571608f54f3009a1de0937cbf8ce89ddee97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Cser=C3=A9p?= <mcserep@gmail.com>
Date: Tue, 18 Jun 2019 09:34:32 +0200
Subject: [PATCH] Thrift is a dependency of LspService and LspHandler, as
 required by the included models. Therefore Thrift must be added to include
 and library path of the LSP service library and the webserver binary.

---
 service/lsp/CMakeLists.txt | 6 ++++--
 webserver/CMakeLists.txt   | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/service/lsp/CMakeLists.txt b/service/lsp/CMakeLists.txt
index 7db838330..cbbd97e54 100644
--- a/service/lsp/CMakeLists.txt
+++ b/service/lsp/CMakeLists.txt
@@ -11,7 +11,8 @@ include_directories(
   ${CMAKE_BINARY_DIR}/model/include
   ${CMAKE_BINARY_DIR}/plugins/cpp/model/include)
 
-include_directories(SYSTEM)
+include_directories(SYSTEM
+  ${THRIFT_LIBTHRIFT_INCLUDE_DIRS})
 
 add_library(lspservice SHARED
   src/lspservice.cpp
@@ -19,7 +20,8 @@ add_library(lspservice SHARED
   src/plugin.cpp)
 
 target_link_libraries(lspservice
-  util)
+  util
+  ${THRIFT_LIBTHRIFT_LIBRARIES})
 
 add_dependencies(lspservice projectthrift)
 add_dependencies(lspservice languagethrift)
diff --git a/webserver/CMakeLists.txt b/webserver/CMakeLists.txt
index 5f4947aff..6dce0d0c7 100644
--- a/webserver/CMakeLists.txt
+++ b/webserver/CMakeLists.txt
@@ -1,3 +1,6 @@
+include_directories(SYSTEM
+  ${THRIFT_LIBTHRIFT_INCLUDE_DIRS})
+  
 add_executable(CodeCompass_webserver
   src/webserver.cpp
   src/mainrequesthandler.cpp
@@ -36,6 +39,7 @@ target_link_libraries(CodeCompass_webserver
   mongoose
   ${Boost_LINK_LIBRARIES}
   ${ODB_LIBRARIES}
+  ${THRIFT_LIBTHRIFT_LIBRARIES}
   pthread
   dl)