Skip to content

Commit

Permalink
no need to build json dep
Browse files Browse the repository at this point in the history
  • Loading branch information
zhipeng-jia committed Apr 4, 2020
1 parent ac3d250 commit aa76e2b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RCOMPILE_FLAGS = -DNDEBUG -O3
# Additional debug-specific flags
DCOMPILE_FLAGS = -DDEBUG -g
# Add additional include paths
INCLUDES = -I$(SRC_PATH) -I./include -I./deps/out/include -I./deps/GSL/include
INCLUDES = -I$(SRC_PATH) -I./include -I./deps/out/include -I./deps/json/single_include -I./deps/GSL/include
# General linker settings
ABSL_LIBRARIES = $(shell find deps/out/lib/libabsl_*.a -printf '%f\n' \
| sed -e 's/libabsl_\([a-z0-9_]\+\)\.a/-labsl_\1/g')
Expand Down
7 changes: 0 additions & 7 deletions build_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,6 @@ export CXXFLAGS="-fdata-sections -ffunction-sections"
rm -rf ${DEPS_INSTALL_PATH}
mkdir -p ${DEPS_INSTALL_PATH}

# Build json
cd $BASE_DIR/deps/json && rm -rf build && mkdir -p build && cd build && \
cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DJSON_BuildTests=OFF -DCMAKE_CXX_STANDARD=17 \
-DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_PATH} .. && \
make -j$(nproc) install && \
rm -rf $BASE_DIR/deps/json/build

# Build abseil-cpp
cd $BASE_DIR/deps/abseil-cpp && rm -rf build && mkdir -p build && cd build && \
cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_STANDARD=17 \
Expand Down

0 comments on commit aa76e2b

Please sign in to comment.