Skip to content

Commit

Permalink
Fix asio
Browse files Browse the repository at this point in the history
  • Loading branch information
Warchant committed Mar 4, 2017
1 parent 1e862da commit fd3f3e1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
12 changes: 5 additions & 7 deletions dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -264,20 +264,18 @@ endif()
#########################
ExternalProject_Add(chriskohlhoff_asio
GIT_REPOSITORY "https://github.com/chriskohlhoff/asio.git"
BUILD_IN_SOURCE 1
SOURCE_DIR ${EP_PREFIX}/src/chriskohlhoff_asio/asio
CONFIGURE_COMMAND ./autogen.sh COMMAND ./configure --without-boost
BUILD_COMMAND $(MAKE)
CONFIGURE_COMMAND "" # remove configure step
BUILD_COMMAND "" # remove build step
INSTALL_COMMAND "" # remove install step
TEST_COMMAND "" # remove test step
UPDATE_COMMAND "" # remove update step
)
ExternalProject_Get_Property(chriskohlhoff_asio source_dir)
set(asio_SOURCE_DIR "${source_dir}")

add_library(asio INTERFACE IMPORTED)
file(MAKE_DIRECTORY ${asio_SOURCE_DIR}/include)
file(MAKE_DIRECTORY ${asio_SOURCE_DIR}/asio/include)
set_target_properties(asio PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${asio_SOURCE_DIR}/include
INTERFACE_INCLUDE_DIRECTORIES ${asio_SOURCE_DIR}/asio/include
)
add_dependencies(asio chriskohlhoff_asio)

2 changes: 1 addition & 1 deletion docker/dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ RUN apt-get update && apt-get -y upgrade; \
cd /tmp; \
git clone --recursive -b $(curl -L http://grpc.io/release) https://github.com/grpc/grpc; \
cd grpc; \
make && make install
make -j4 && make install

# build and mktar scripts
ADD ./scripts /

0 comments on commit fd3f3e1

Please sign in to comment.