diff options
author | llnulldisk <48621230+llnulldisk@users.noreply.github.com> | 2022-09-30 17:46:58 +0200 |
---|---|---|
committer | llnulldisk <48621230+llnulldisk@users.noreply.github.com> | 2022-09-30 17:46:58 +0200 |
commit | 70b02c460b55f6a6722a852704ee7d916c48ed47 (patch) | |
tree | 6b9134d703edcc2e173ad3218daac1b3ecd4e6a1 /samples/echobot-setmycommands | |
parent | d9dfa73edda127580e0961c89d8fafa56735f672 (diff) |
Update docker files and CMakeLists
Diffstat (limited to 'samples/echobot-setmycommands')
-rw-r--r-- | samples/echobot-setmycommands/CMakeLists.txt | 12 | ||||
-rw-r--r-- | samples/echobot-setmycommands/Dockerfile | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/samples/echobot-setmycommands/CMakeLists.txt b/samples/echobot-setmycommands/CMakeLists.txt index 7019e8f..e6c63eb 100644 --- a/samples/echobot-setmycommands/CMakeLists.txt +++ b/samples/echobot-setmycommands/CMakeLists.txt @@ -1,7 +1,9 @@ -cmake_minimum_required(VERSION 2.8.4) -project(echobot) +cmake_minimum_required(VERSION 3.13.4) +project(echobot-setmycommands) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall") +set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") set(Boost_USE_MULTITHREADED ON) find_package(Threads REQUIRED) @@ -14,6 +16,6 @@ if (CURL_FOUND) add_definitions(-DHAVE_CURL) endif() -add_executable(echobot src/main.cpp) +add_executable(echobot-setmycommands src/main.cpp) -target_link_libraries(echobot /usr/local/lib/libTgBot.a ${CMAKE_THREAD_LIBS_INIT} ${OPENSSL_LIBRARIES} ${Boost_LIBRARIES} ${CURL_LIBRARIES}) +target_link_libraries(echobot-setmycommands /usr/local/lib/libTgBot.a ${CMAKE_THREAD_LIBS_INIT} ${OPENSSL_LIBRARIES} ${Boost_LIBRARIES} ${CURL_LIBRARIES}) diff --git a/samples/echobot-setmycommands/Dockerfile b/samples/echobot-setmycommands/Dockerfile index a7aa61a..c103a7d 100644 --- a/samples/echobot-setmycommands/Dockerfile +++ b/samples/echobot-setmycommands/Dockerfile @@ -1,8 +1,8 @@ FROM reo7sp/tgbot-cpp MAINTAINER Oleg Morozenkov <a@reo7sp.ru> -WORKDIR /usr/src/echobot +WORKDIR /usr/src/echobot-setmycommands COPY . . RUN cmake . RUN make -j4 -CMD ./echobot +CMD ./echobot-setmycommands |