Skip to content

Commit a2f3fae

Browse files
committed
Prebuild rsocket-rpc-protobuf
1 parent ea9253e commit a2f3fae

File tree

3 files changed

+412
-180
lines changed

3 files changed

+412
-180
lines changed

.travis.yml

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,22 @@ matrix:
2323
- pushd rsocket-rpc-js
2424
- yarn install && yarn protoc && yarn test
2525
- popd
26-
- language: cpp
27-
os: linux
28-
dist: xenial
29-
compiler: gcc
30-
before_install:
31-
- wget https://github.com/google/protobuf/releases/download/v3.6.1/protobuf-cpp-3.6.1.tar.gz
32-
- tar -xzvf protobuf-cpp-3.6.1.tar.gz
33-
- pushd protobuf-3.6.1
34-
- ./configure --disable-shared && make && sudo make install
35-
- popd
36-
script:
3726
- pushd rsocket-rpc-protobuf
38-
- cmake . -Bbuild && make -Cbuild
27+
- yarn install && yarn prebuild
3928
- popd
40-
- language: cpp
29+
- language: node_js
4130
os: osx
4231
osx_image: xcode10.1
43-
compiler: clang
32+
node_js:
33+
- 10
34+
cache: yarn
35+
addons:
36+
apt:
37+
sources:
38+
- sourceline: 'deb https://dl.yarnpkg.com/debian/ stable main'
39+
key_url: 'https://dl.yarnpkg.com/debian/pubkey.gpg'
40+
packages:
41+
- yarn
4442
before_install:
4543
- curl -O -L https://github.com/google/protobuf/releases/download/v3.6.1/protobuf-cpp-3.6.1.tar.gz
4644
- tar -xzf protobuf-cpp-3.6.1.tar.gz
@@ -50,10 +48,20 @@ matrix:
5048
- popd
5149
script:
5250
- pushd rsocket-rpc-protobuf
53-
- cmake . -Bbuild && make -Cbuild
51+
- yarn install && yarn prebuild
5452
- popd
55-
- language: cpp
53+
- language: node_js
5654
os: windows
55+
node_js:
56+
- 10
57+
cache: yarn
58+
addons:
59+
apt:
60+
sources:
61+
- sourceline: 'deb https://dl.yarnpkg.com/debian/ stable main'
62+
key_url: 'https://dl.yarnpkg.com/debian/pubkey.gpg'
63+
packages:
64+
- yarn
5765
before_install:
5866
- rm -r "/c/Program Files (x86)/Microsoft Visual Studio 14.0"
5967
- export PATH=$PATH:"/c/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/HostX86/x64"
@@ -66,7 +74,5 @@ matrix:
6674
- popd
6775
script:
6876
- pushd rsocket-rpc-protobuf
69-
- mkdir build && cd build
70-
- cmake -A x64 -DCMAKE_CXX_FLAGS="-std=c++11 -EHsc" -DProtobuf_LIBRARIES=/c/Program\ Files/protobuf/lib/ -DProtobuf_INCLUDE_DIR=/c/Program\ Files/protobuf/include/ -DProtobuf_LIBRARY=/c/Program\ Files/protobuf/lib/libprotobuf.lib -DProtobuf_PROTOC_LIBRARY=/c/Program\ Files/protobuf/lib/libprotoc.lib ..
71-
- cmake --build . --config Release
77+
- yarn install && yarn prebuild
7278
- popd

rsocket-rpc-protobuf/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ else()
1313
endif()
1414

1515
if(MSVC)
16+
set(Protobuf_LIBRARIES "/c/Program Files/protobuf/lib")
17+
set(Protobuf_INCLUDE_DIR "/c/Program Files/protobuf/include")
18+
set(Protobuf_LIBRARY "/c/Program Files/protobuf/lib/libprotobuf.lib")
19+
set(Protobuf_PROTOC_LIBRARY "/c/Program Files/protobuf/lib/libprotoc.lib")
1620
set(CompilerFlags
1721
CMAKE_CXX_FLAGS
1822
CMAKE_CXX_FLAGS_DEBUG

0 commit comments

Comments
 (0)