File tree 2 files changed +17
-4
lines changed
2 files changed +17
-4
lines changed Original file line number Diff line number Diff line change @@ -82,12 +82,14 @@ before_script:
82
82
- gem install coveralls-lcov
83
83
- lcov --version
84
84
- eval "$COMPILER_EVAL"
85
+ # Build folly
86
+ - mkdir build
87
+ - ./scripts/build_folly.sh build/folly-src build/folly-install
85
88
86
89
script :
87
- - mkdir build
88
90
- cd build
89
- - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE
90
- -DRSOCKET_ASAN=$ASAN -DRSOCKET_INSTALL_DEPS=True
91
+ - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DRSOCKET_ASAN=$ASAN
92
+ -DCMAKE_PREFIX_PATH=$PWD/folly-install
91
93
-DRSOCKET_BUILD_WITH_COVERAGE=ON ..
92
94
- make -j4
93
95
- lcov --directory . --zerocounters
Original file line number Diff line number Diff line change @@ -9,6 +9,13 @@ if [[ -z $INSTALL_DIR ]]; then
9
9
exit 1
10
10
fi
11
11
12
+ # Convert INSTALL_DIR to an absolute path so it still refers to the same
13
+ # location after we cd into the build directory.
14
+ case " $INSTALL_DIR " in
15
+ /* ) ;;
16
+ * ) INSTALL_DIR=" $PWD /$INSTALL_DIR "
17
+ esac
18
+
12
19
# If folly was already installed, just return early
13
20
INSTALL_MARKER_FILE=" $INSTALL_DIR /folly.installed"
14
21
if [[ -f $INSTALL_MARKER_FILE ]]; then
28
35
29
36
mkdir -p " $CHECKOUT_DIR /_build"
30
37
cd " $CHECKOUT_DIR /_build"
31
- cmake " -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} " ..
38
+ if ! cmake " -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} " ..; then
39
+ echo " error configuring folly" >&2
40
+ tail -n 100 CMakeFiles/CMakeError.log >&2
41
+ exit 1
42
+ fi
32
43
make -j4
33
44
make install
34
45
touch " $INSTALL_MARKER_FILE "
You can’t perform that action at this time.
0 commit comments