From c3bd1953be2504e1f9ec383aedb757d3b86daa1b Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Fri, 30 Aug 2019 21:00:48 +0200
Subject: [PATCH] CMake: Rename BUILD_tools to EXPAT_BUILD_TOOLS

---
 expat/CMakeLists.txt            | 10 +++++-----
 expat/win32/build_expat_iss.bat |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt
index 706f18ee..56ffcccd 100644
--- a/expat/CMakeLists.txt
+++ b/expat/CMakeLists.txt
@@ -41,7 +41,7 @@ endif()
 #
 # Configuration
 #
-option(BUILD_tools "build the xmlwf tool for expat library" ${_EXPAT_BUILD_TOOLS_DEFAULT})
+option(EXPAT_BUILD_TOOLS "build the xmlwf tool for expat library" ${_EXPAT_BUILD_TOOLS_DEFAULT})
 option(BUILD_examples "build the examples for expat library" ON)
 option(BUILD_tests "build the tests for expat library" ON)
 option(BUILD_shared "build a shared expat library" ON)
@@ -118,8 +118,8 @@ if(XML_UNICODE_WCHAR_T AND NOT XML_UNICODE)
     set(XML_UNICODE 1)
 endif(XML_UNICODE_WCHAR_T AND NOT XML_UNICODE)
 
-if(BUILD_tools AND (XML_UNICODE AND NOT XML_UNICODE_WCHAR_T))
-    message(SEND_ERROR "The xmlwf tool can not be built with option XML_UNICODE_WCHAR_T=OFF and XML_UNICODE=ON. Either set XML_UNICODE_WCHAR_T=ON or BUILD_tools=OFF.")
+if(EXPAT_BUILD_TOOLS AND (XML_UNICODE AND NOT XML_UNICODE_WCHAR_T))
+    message(SEND_ERROR "The xmlwf tool can not be built with option XML_UNICODE_WCHAR_T=OFF and XML_UNICODE=ON. Either set XML_UNICODE_WCHAR_T=ON or EXPAT_BUILD_TOOLS=OFF.")
 endif()
 
 include(${CMAKE_CURRENT_LIST_DIR}/ConfigureChecks.cmake)
@@ -278,7 +278,7 @@ expat_install(FILES ${CMAKE_CURRENT_BINARY_DIR}/expat.pc DESTINATION ${CMAKE_INS
 #
 # C command line tool xmlwf
 #
-if(BUILD_tools)
+if(EXPAT_BUILD_TOOLS)
     set(xmlwf_SRCS
         xmlwf/xmlwf.c
         xmlwf/xmlfile.c
@@ -451,7 +451,7 @@ message(STATUS "  Build documentation ........ ${BUILD_doc}")
 message(STATUS "  Build examples ............. ${BUILD_examples}")
 message(STATUS "  Build fuzzers .............. ${BUILD_fuzzers}")
 message(STATUS "  Build tests ................ ${BUILD_tests}")
-message(STATUS "  Build tools (xmlwf) ........ ${BUILD_tools}")
+message(STATUS "  Build tools (xmlwf) ........ ${EXPAT_BUILD_TOOLS}")
 message(STATUS "  Install files .............. ${INSTALL}")
 message(STATUS "")
 message(STATUS "  Features")
diff --git a/expat/win32/build_expat_iss.bat b/expat/win32/build_expat_iss.bat
index 80304576..798175c1 100644
--- a/expat/win32/build_expat_iss.bat
+++ b/expat/win32/build_expat_iss.bat
@@ -43,7 +43,7 @@ MD %BINDIR% || EXIT /b 1
 
 MD build_shared_char || EXIT /b 1
 CD build_shared_char || EXIT /b 1
-    cmake -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DMSVC_USE_STATIC_CRT=ON -DBUILD_examples=OFF -DBUILD_tests=OFF -DBUILD_tools=OFF .. || EXIT /b 1
+    cmake -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DMSVC_USE_STATIC_CRT=ON -DBUILD_examples=OFF -DBUILD_tests=OFF -DEXPAT_BUILD_TOOLS=OFF .. || EXIT /b 1
     msbuild /m expat.sln || EXIT /b 1
     DIR %CONFIGURATION% || EXIT /b 1
     CD .. || EXIT /b 1
@@ -63,7 +63,7 @@ COPY build_static_char\xmlwf\%CONFIGURATION%\xmlwf.exe %BINDIR%\ || EXIT /b 1
 
 MD build_shared_wchar_t || EXIT /b 1
 CD build_shared_wchar_t || EXIT /b 1
-    cmake -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DMSVC_USE_STATIC_CRT=ON -DBUILD_examples=OFF -DBUILD_tests=OFF -DBUILD_tools=OFF -DXML_UNICODE=ON -DXML_UNICODE_WCHAR_T=ON .. || EXIT /b 1
+    cmake -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DMSVC_USE_STATIC_CRT=ON -DBUILD_examples=OFF -DBUILD_tests=OFF -DEXPAT_BUILD_TOOLS=OFF -DXML_UNICODE=ON -DXML_UNICODE_WCHAR_T=ON .. || EXIT /b 1
     msbuild /m expat.sln || EXIT /b 1
     DIR %CONFIGURATION% || EXIT /b 1
     CD .. || EXIT /b 1
@@ -73,7 +73,7 @@ COPY build_shared_wchar_t\%CONFIGURATION%\expatw.lib %BINDIR%\ || EXIT /b 1
 
 MD build_static_wchar_t || EXIT /b 1
 CD build_static_wchar_t || EXIT /b 1
-    cmake -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DMSVC_USE_STATIC_CRT=ON -DBUILD_examples=OFF -DBUILD_tests=OFF -DBUILD_tools=OFF -DBUILD_shared=OFF -DXML_UNICODE=ON -DXML_UNICODE_WCHAR_T=ON .. || EXIT /b 1
+    cmake -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DMSVC_USE_STATIC_CRT=ON -DBUILD_examples=OFF -DBUILD_tests=OFF -DEXPAT_BUILD_TOOLS=OFF -DBUILD_shared=OFF -DXML_UNICODE=ON -DXML_UNICODE_WCHAR_T=ON .. || EXIT /b 1
     msbuild /m expat.sln || EXIT /b 1
     DIR %CONFIGURATION% || EXIT /b 1
     CD .. || EXIT /b 1