kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disable building ws on windows on travis

Browse Source
This commit is contained in:
Benjamin Sergeant
2019-06-10 22:01:19 -07:00
parent 71aad26d44
commit 9d70fb2b86
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@@ -36,6 +36,6 @@ matrix:
- CMAKE_PATH="/c/Program Files/CMake/bin" - CMAKE_PATH="/c/Program Files/CMake/bin"
script: script:
- export PATH=$CMAKE_PATH:$PATH - export PATH=$CMAKE_PATH:$PATH
- cmake -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 -DUSE_VENDORED_THIRD_PARTY=1 . # - cmake -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 -DUSE_VENDORED_THIRD_PARTY=1 .
- cmake --build --parallel . # - cmake --build --parallel .
- python test/run.py - python test/run.py

3
test/run.py
View File

@@ -99,8 +99,10 @@ def runCMake(sanitizer, buildDir):
#generator = '"NMake Makefiles"' #generator = '"NMake Makefiles"'
#generator = '"Visual Studio 16 2019"' #generator = '"Visual Studio 16 2019"'
generator = '"Visual Studio 15 2017"' generator = '"Visual Studio 15 2017"'
USE_VENDORED_THIRD_PARTY = 'ON'
else: else:
generator = '"Unix Makefiles"' generator = '"Unix Makefiles"'
USE_VENDORED_THIRD_PARTY = 'OFF'
CMAKE_BUILD_TYPE = BUILD_TYPE CMAKE_BUILD_TYPE = BUILD_TYPE
@@ -110,6 +112,7 @@ def runCMake(sanitizer, buildDir):
-DCMAKE_BUILD_TYPE={CMAKE_BUILD_TYPE} \ -DCMAKE_BUILD_TYPE={CMAKE_BUILD_TYPE} \
-DUSE_TLS=1 \ -DUSE_TLS=1 \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DUSE_VENDORED_THIRD_PARTY={USE_VENDORED_THIRD_PARTY} \
-G{generator}' -G{generator}'
cmakeCmd = fmt.format(**locals()) cmakeCmd = fmt.format(**locals())