From 95a8a4db5055b9f1fd0f21549d16e3310e81e928 Mon Sep 17 00:00:00 2001 From: wener Date: Sat, 18 Feb 2017 02:43:30 +0800 Subject: [PATCH] Add missing ss-redir install; Remove cmake build success echo. --- .travis.yml | 2 +- CMakeLists.txt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index eb01c0b2..d635f14a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ script: - ./configure && make # Test cmake using our builder - cd docker/build && docker build -f builder.Dockerfile -t builder . && cd - - - docker run --rm -it -v $PWD:/src -w /src builder sh -c /src/docker/build/dockerbuild.sh && echo yes + - docker run --rm -it -v $PWD:/src -w /src builder sh -c /src/docker/build/dockerbuild.sh branches: only: - master diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d471550..1c3e51be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -452,4 +452,8 @@ install(DIRECTORY DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) install(TARGETS ss-server RUNTIME DESTINATION bin) install(TARGETS ss-tunnel RUNTIME DESTINATION bin) install(TARGETS ss-manager RUNTIME DESTINATION bin) -install(TARGETS ss-local RUNTIME DESTINATION bin) \ No newline at end of file +install(TARGETS ss-local RUNTIME DESTINATION bin) + +if (LINUX) + install(TARGETS ss-redir RUNTIME DESTINATION bin) +endif (LINUX)