Skip to content
Snippets Groups Projects
Commit d2fd6029 authored by Mateusz Gniewkowski's avatar Mateusz Gniewkowski
Browse files

Merge branch 'develop' into 'master' 

Develop

See merge request !2
parents 8ce782f7 76249c18
No related branches found
No related tags found
1 merge request!2Develop
Show whitespace changes
Inline Side-by-side
CMakeLists.txt
+ 0
− 3
View file @ d2fd6029
...@@ -15,9 +15,6 @@ find_package(Boost COMPONENTS program_options system thread filesystem chrono at ...@@ -15,9 +15,6 @@ find_package(Boost COMPONENTS program_options system thread filesystem chrono at
link_directories(${Boost_LIBRARY_DIRS}) link_directories(${Boost_LIBRARY_DIRS})
set(LIBS ${LIBS} ${Boost_LIBRARIES}) set(LIBS ${LIBS} ${Boost_LIBRARIES})
find_package(amqpcpp REQUIRED)
set(LIBS ${LIBS} amqpcpp)
find_package(Threads) find_package(Threads)
set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT}) set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT})
......
Dockerfile
+ 2
− 1
View file @ d2fd6029
FROM clarinpl/cpp FROM clarinpl/cpp:16.04
RUN apt update && apt install wsnlp-16-04
WORKDIR /home/install WORKDIR /home/install
COPY CMakeScripts/ CMakeScripts/ COPY CMakeScripts/ CMakeScripts/
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment