aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitaly Buka <vitalybuka@google.com>2017-08-08 16:22:46 -0700
committerKostya Serebryany <konstantin.s.serebryany@gmail.com>2017-08-08 16:47:50 -0700
commitdf4f45a30a7066ac280770dcb99112ef6b5baf8c (patch)
treece88b018d0eec7264890452bf499b41b26392f8f
parent34287f8fa212b9a3498b4ae7709ef418ac987e1b (diff)
downloadlibprotobuf-mutator-df4f45a30a7066ac280770dcb99112ef6b5baf8c.tar.gz
Remove dependence on docbook2x
-rw-r--r--.travis.yml1
-rw-r--r--README.md2
-rw-r--r--cmake/external/expat.cmake4
3 files changed, 3 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 4d1cb95..d8eb5a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,6 @@ addons:
- ninja-build
- liblzma-dev
- libz-dev
- - docbook2x
sources: &common_sources
- ubuntu-toolchain-r-test
diff --git a/README.md b/README.md
index 26a44cf..fce2b77 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Install prerequisites:
```
sudo apt-get update
-sudo apt-get install binutils cmake ninja-build liblzma-dev libz-dev docbook2x
+sudo apt-get install binutils cmake ninja-build liblzma-dev libz-dev
```
Compile and test everything:
diff --git a/cmake/external/expat.cmake b/cmake/external/expat.cmake
index 1f7ce20..a8e2c99 100644
--- a/cmake/external/expat.cmake
+++ b/cmake/external/expat.cmake
@@ -42,7 +42,7 @@ ExternalProject_Add(${EXPAT_TARGET}
CXX=${CMAKE_CXX_COMPILER}
"CFLAGS=${EXPAT_CFLAGS} -w -DXML_POOR_ENTROPY"
"CXXFLAGS=${EXPAT_CXXFLAGS} -w -DXML_POOR_ENTROPY"
- BUILD_COMMAND cd ${EXPAT_SRC_DIR} && make -j ${CPU_COUNT} all
- INSTALL_COMMAND cd ${EXPAT_SRC_DIR} && make install
+ BUILD_COMMAND cd ${EXPAT_SRC_DIR} && make -j ${CPU_COUNT} buildlib
+ INSTALL_COMMAND cd ${EXPAT_SRC_DIR} && make installlib
BUILD_BYPRODUCTS ${EXPAT_BUILD_BYPRODUCTS}
)