Removed bundled pugixml.

NilsBrause · Feb 24, 2019 · 433ce65 · 433ce65
1 parent 0d6cbd1
commit 433ce65
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12,053 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -59,15 +59,10 @@ set(CMAKE_CXX_STANDARD 11)
 
 # build scanner
 if(BUILD_SCANNER)
-  pkg_check_modules(PUGIXML "pugixml>=1.4")
-  if(PUGIXML_FOUND)
-    add_executable(wayland-scanner++ scanner/scanner.cpp)
-    target_link_libraries(wayland-scanner++ ${PUGIXML_LIBRARIES})
-    target_compile_options(wayland-scanner++ PUBLIC ${PUGIXML_CFLAGS})
-  else()
-    add_executable(wayland-scanner++ scanner/scanner.cpp scanner/pugixml.cpp)
-    message(DEPRECATION "Bundled pugixml will be removed in a future release.")
-  endif()
+  pkg_check_modules(PUGIXML REQUIRED "pugixml>=1.4")
+  add_executable(wayland-scanner++ scanner/scanner.cpp)
+  target_link_libraries(wayland-scanner++ ${PUGIXML_LIBRARIES})
+  target_compile_options(wayland-scanner++ PUBLIC ${PUGIXML_CFLAGS})
   configure_file(wayland-scanner++.pc.in wayland-scanner++.pc @ONLY)
   install(TARGETS wayland-scanner++ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}")
   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/wayland-scanner++.pc" DESTINATION "${INSTALL_FULL_PKGCONFIGDIR}")

diff --git a/README.md b/README.md
@@ -13,7 +13,8 @@ an easy to use C++ API to Wayland.
 
 To build this library, a recent version of cmake is required. Furthermore,
 a recent C++ Compiler with C++11 support, such as GCC or clang, is required.
-Apart from the Wayland libraries, there are no further library dependencies.
+Also, pugixml is required to build the XML protocol scanner. Apart from the
+Wayland libraries, there are no further library dependencies.
 
 The documentation is autogenerated using Doxygen, therefore doxygen as
 well as graphviz is required.

diff --git a/scanner/pugiconfig.hpp b/scanner/pugiconfig.hpp