diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt index 56ffcccd..177fbebe 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -42,7 +42,7 @@ endif() # Configuration # 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(EXPAT_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) option(BUILD_doc "build man page for xmlwf" ${BUILD_doc_default}) @@ -300,7 +300,7 @@ endif() # # C code examples # -if(BUILD_examples) +if(EXPAT_BUILD_EXAMPLES) add_executable(elements examples/elements.c) set_property(TARGET elements PROPERTY RUNTIME_OUTPUT_DIRECTORY examples) target_link_libraries(elements expat) @@ -308,7 +308,7 @@ if(BUILD_examples) add_executable(outline examples/outline.c) set_property(TARGET outline PROPERTY RUNTIME_OUTPUT_DIRECTORY examples) target_link_libraries(outline expat) -endif(BUILD_examples) +endif(EXPAT_BUILD_EXAMPLES) # # C/C++ test runners @@ -448,7 +448,7 @@ if(WIN32) endif() message(STATUS "") message(STATUS " Build documentation ........ ${BUILD_doc}") -message(STATUS " Build examples ............. ${BUILD_examples}") +message(STATUS " Build examples ............. ${EXPAT_BUILD_EXAMPLES}") message(STATUS " Build fuzzers .............. ${BUILD_fuzzers}") message(STATUS " Build tests ................ ${BUILD_tests}") message(STATUS " Build tools (xmlwf) ........ ${EXPAT_BUILD_TOOLS}") diff --git a/expat/win32/build_expat_iss.bat b/expat/win32/build_expat_iss.bat index 798175c1..577a84f3 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 -DEXPAT_BUILD_TOOLS=OFF .. || EXIT /b 1 + cmake -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DMSVC_USE_STATIC_CRT=ON -DEXPAT_BUILD_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 @@ -53,7 +53,7 @@ COPY build_shared_char\%CONFIGURATION%\expat.lib %BINDIR%\ || EXIT /b 1 MD build_static_char || EXIT /b 1 CD build_static_char || EXIT /b 1 - cmake -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DMSVC_USE_STATIC_CRT=ON -DBUILD_examples=OFF -DBUILD_tests=OFF -DBUILD_shared=OFF .. || EXIT /b 1 + cmake -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DMSVC_USE_STATIC_CRT=ON -DEXPAT_BUILD_EXAMPLES=OFF -DBUILD_tests=OFF -DBUILD_shared=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 -DEXPAT_BUILD_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 -DEXPAT_BUILD_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 -DEXPAT_BUILD_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 -DEXPAT_BUILD_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