Thrift is a dependency of LspService and LspHandler, as required by t…

…he included models. Therefore Thrift must be added to include and library path of the LSP service library and the webserver binary.
Ericsson · Jun 18, 2019 · 9a47571 · 9a47571
1 parent 0a0f585
commit 9a47571
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/service/lsp/CMakeLists.txt b/service/lsp/CMakeLists.txt
@@ -11,15 +11,17 @@ 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
  src/lsp_types.cpp
  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
@@ -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)