diff options
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | Dockerfile_test | 7 |
2 files changed, 5 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f8bbcf..1759746 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,15 +1,14 @@ cmake_minimum_required(VERSION 2.8.4) project(TgBot) -set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) - # options option(ENABLE_TESTS "Set to ON to enable building of tests" OFF) option(BUILD_SHARED_LIBS "Build tgbot-cpp shared/static library." OFF) # sources if(WIN32) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") # Do not activate all warnings in VS (too much output for Appveyor) + set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") else() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall") endif() @@ -34,7 +33,7 @@ set(SRC_LIST ## threads find_package(Threads REQUIRED) -# zlib +## zlib find_package(ZLIB REQUIRED) ## openssl diff --git a/Dockerfile_test b/Dockerfile_test index 9ff0764..656e67f 100644 --- a/Dockerfile_test +++ b/Dockerfile_test @@ -1,11 +1,8 @@ -FROM ubuntu:14.04 +FROM debian:stretch MAINTAINER Oleg Morozenkov <a@reo7sp.ru> RUN apt-get -qq update && \ - apt-get -qq install -y g++ make binutils cmake libssl-dev libcurl4-openssl-dev - -RUN apt-get -qq update && \ - apt-get -qq install -y wget build-essential python-dev autotools-dev libicu-dev libbz2-dev zlib1g-dev + apt-get -qq install -y g++ make binutils cmake libssl-dev libcurl4-openssl-dev wget build-essential python-dev autotools-dev libicu-dev libbz2-dev zlib1g-dev WORKDIR /usr/src/boost RUN wget -q -O boost_1_59_0.tar.gz https://sourceforge.net/projects/boost/files/boost/1.59.0/boost_1_59_0.tar.gz/download && \ |