From 458be796ae8f7a8fb3ba175d7b335ccf9e1e462f Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Fri, 30 Aug 2019 21:20:55 +0200 Subject: [PATCH] CMake: Rename WARNINGS_AS_ERRORS to EXPAT_WARNINGS_AS_ERRORS --- appveyor.yml | 2 +- expat/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 692387b2..c332ad48 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -164,7 +164,7 @@ environment: before_build: - echo Running cmake... - cd c:\projects\libexpat - - cmake -DWARNINGS_AS_ERRORS=ON -G"%GENERATOR%" expat + - cmake -DEXPAT_WARNINGS_AS_ERRORS=ON -G"%GENERATOR%" expat build: parallel: true # enable MSBuild parallel builds diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt index 39129f8c..55157e7e 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -52,7 +52,7 @@ 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") option(XML_DTD "Define to make parameter entity parsing functionality available" ON) option(XML_NS "Define to make XML Namespaces functionality available" ON) -option(WARNINGS_AS_ERRORS "Treat all compiler warnings as errors" OFF) +option(EXPAT_WARNINGS_AS_ERRORS "Treat all compiler warnings as errors" OFF) if(NOT WIN32) option(XML_DEV_URANDOM "Define to include code reading entropy from `/dev/urandom'." ON) set(USE_GETRANDOM "AUTO" CACHE STRING @@ -158,13 +158,13 @@ if(FLAG_VISIBILITY) add_definitions(-DXML_ENABLE_VISIBILITY=1) set(EXTRA_COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} -fvisibility=hidden") endif(FLAG_VISIBILITY) -if (WARNINGS_AS_ERRORS) +if (EXPAT_WARNINGS_AS_ERRORS) if(MSVC) add_definitions(/WX) else(MSVC) set(EXTRA_COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} -Werror") endif(MSVC) -endif(WARNINGS_AS_ERRORS) +endif(EXPAT_WARNINGS_AS_ERRORS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_COMPILE_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_COMPILE_FLAGS}")