File tree Expand file tree Collapse file tree 2 files changed +17
-4
lines changed Expand file tree Collapse file tree 2 files changed +17
-4
lines changed Original file line number Diff line number Diff line change @@ -82,12 +82,14 @@ before_script:
8282 - gem install coveralls-lcov
8383 - lcov --version
8484 - eval "$COMPILER_EVAL"
85+ # Build folly
86+ - mkdir build
87+ - ./scripts/build_folly.sh build/folly-src build/folly-install
8588
8689script :
87- - mkdir build
8890 - 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
9193 -DRSOCKET_BUILD_WITH_COVERAGE=ON ..
9294 - make -j4
9395 - lcov --directory . --zerocounters
Original file line number Diff line number Diff line change @@ -9,6 +9,13 @@ if [[ -z $INSTALL_DIR ]]; then
99 exit 1
1010fi
1111
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+
1219# If folly was already installed, just return early
1320INSTALL_MARKER_FILE=" $INSTALL_DIR /folly.installed"
1421if [[ -f $INSTALL_MARKER_FILE ]]; then
2835
2936mkdir -p " $CHECKOUT_DIR /_build"
3037cd " $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
3243make -j4
3344make install
3445touch " $INSTALL_MARKER_FILE "
You can’t perform that action at this time.
0 commit comments