diff options
author | Vitaly Buka <vitalybuka@google.com> | 2017-08-08 16:22:46 -0700 |
---|---|---|
committer | Kostya Serebryany <konstantin.s.serebryany@gmail.com> | 2017-08-08 16:47:50 -0700 |
commit | df4f45a30a7066ac280770dcb99112ef6b5baf8c (patch) | |
tree | ce88b018d0eec7264890452bf499b41b26392f8f | |
parent | 34287f8fa212b9a3498b4ae7709ef418ac987e1b (diff) | |
download | libprotobuf-mutator-df4f45a30a7066ac280770dcb99112ef6b5baf8c.tar.gz |
Remove dependence on docbook2x
-rw-r--r-- | .travis.yml | 1 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | cmake/external/expat.cmake | 4 |
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 @@ -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} ) |