Browse Source

Add missing ss-redir install; Remove cmake build success echo.

pull/1272/head
wener 7 years ago
parent
commit
95a8a4db50
2 changed files with 6 additions and 2 deletions
  1. 2
      .travis.yml
  2. 6
      CMakeLists.txt

2
.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

6
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)
install(TARGETS ss-local RUNTIME DESTINATION bin)
if (LINUX)
install(TARGETS ss-redir RUNTIME DESTINATION bin)
endif (LINUX)
Loading…
Cancel
Save