From 0c6508b9f61b46ab67415e6ba505880356b4a6ea Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Fri, 30 Aug 2019 21:13:41 +0200 Subject: [PATCH] CMake: Rename BUILD_fuzzers to EXPAT_BUILD_FUZZERS --- .travis.yml | 2 +- expat/CMakeLists.txt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3defccee..ae0d41d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ matrix: - os: linux env: MODE=clang-format - os: linux - env: MODE=cmake-oos CMAKE_ARGS="-DXML_ATTR_INFO=ON -DBUILD_fuzzers=ON -DCMAKE_C_FLAGS=-fsanitize=address -DCMAKE_CXX_FLAGS=-fsanitize=address -DCMAKE_EXE_LINKER_FLAGS=-fsanitize=address -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++" + env: MODE=cmake-oos CMAKE_ARGS="-DXML_ATTR_INFO=ON -DEXPAT_BUILD_FUZZERS=ON -DCMAKE_C_FLAGS=-fsanitize=address -DCMAKE_CXX_FLAGS=-fsanitize=address -DCMAKE_EXE_LINKER_FLAGS=-fsanitize=address -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++" - os: linux env: MODE=qa-sh QA_COMPILER=clang CC=clang CXX=clang++ LD=clang++ QA_SANITIZER=address CONFIGURE_ARGS=--enable-xml-attr-info - os: linux diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt index 56312ae3..ec6a7363 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -46,7 +46,7 @@ option(EXPAT_BUILD_EXAMPLES "build the examples for expat library" ON) option(EXPAT_BUILD_TESTS "build the tests for expat library" ON) option(BUILD_shared "build a shared expat library" ON) option(EXPAT_BUILD_DOCS "build man page for xmlwf" ${_EXPAT_BUILD_DOCS_DEFAULT}) -option(BUILD_fuzzers "build fuzzers for the expat library" OFF) +option(EXPAT_BUILD_FUZZERS "build fuzzers for the expat library" OFF) option(USE_libbsd "utilize libbsd (for arc4random_buf)" OFF) option(INSTALL "install expat files in cmake install target" ON) set(XML_CONTEXT_BYTES 1024 CACHE STRING "Define to specify how much context to retain around the current parse point") @@ -336,7 +336,7 @@ if(EXPAT_BUILD_TESTS) add_test(runtestspp tests/runtestspp) endif(EXPAT_BUILD_TESTS) -if(BUILD_fuzzers) +if(EXPAT_BUILD_FUZZERS) if(NOT "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") message(SEND_ERROR "Building fuzz targets without Clang (but ${CMAKE_C_COMPILER_ID}) " @@ -371,7 +371,7 @@ if(BUILD_fuzzers) TARGET ${target_name} PROPERTY RUNTIME_OUTPUT_DIRECTORY fuzz) endforeach() endforeach() -endif(BUILD_fuzzers) +endif(EXPAT_BUILD_FUZZERS) # # Documentation @@ -449,7 +449,7 @@ endif() message(STATUS "") message(STATUS " Build documentation ........ ${EXPAT_BUILD_DOCS}") message(STATUS " Build examples ............. ${EXPAT_BUILD_EXAMPLES}") -message(STATUS " Build fuzzers .............. ${BUILD_fuzzers}") +message(STATUS " Build fuzzers .............. ${EXPAT_BUILD_FUZZERS}") message(STATUS " Build tests ................ ${EXPAT_BUILD_TESTS}") message(STATUS " Build tools (xmlwf) ........ ${EXPAT_BUILD_TOOLS}") message(STATUS " Install files .............. ${INSTALL}")