Merge branch 'master' into sgjp

288c3991 · Bartosz Ziemba · 420319f5 · a24ccf6f · 288c3991 · 288c3991
Commit 288c3991 authored Sep 27, 2021 by Bartosz Ziemba
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

Dockerfile Dockerfile +2 -1

src/CMakeLists.txt src/CMakeLists.txt +1 -4

No files found.
--- a/Dockerfile
+++ b/Dockerfile
-FROM clarinpl/cpp
+FROM clarinpl/cpp:16.04

+RUN apt update && apt install wsnlp-16-04

 WORKDIR /home/install
 COPY src/ src/

--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
 PROJECT(morphodita)

 cmake_minimum_required(VERSION 3.5.0)
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14)
 SET(CMAKE_CXX_FLAGS -pthread)
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts)

@@ -15,9 +15,6 @@ find_package(Boost COMPONENTS program_options system thread filesystem)
 link_directories(${Boost_LIBRARY_DIRS})
 set(LIBS ${LIBS} ${Boost_LIBRARIES})

-find_package(amqpcpp REQUIRED)
-set(LIBS ${LIBS} amqpcpp)
-
 add_executable(morphodita morphoDita_service.cpp unmerge.cpp)
 target_link_libraries(morphodita ${LIBS})