GerbilSoft/rom-properties
1
Fork 0
mirror of https://github.com/GerbilSoft/rom-properties.git synced 2025-06-18 03:25:38 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Missed a few TinyXML2 remnants. Updated for PugiXML.

Browse Source
This commit is contained in:
David Korth 2025-04-02 00:19:34 -04:00
parent e92eeeea63
commit 5538794477
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/codecov.yml vendored
View File

@ -9,7 +9,7 @@ jobs:
- name: Install required packages
run: |
sudo apt-get update
sudo apt-get install --yes cmake ninja-build libcurl4-openssl-dev zlib1g-dev libpng-dev libjpeg-dev nettle-dev pkg-config libtinyxml2-dev gettext libseccomp-dev libfmt-dev libzstd-dev liblz4-dev liblzo2-dev qtbase5-dev qttools5-dev-tools extra-cmake-modules libkf5kio-dev libkf5widgetsaddons-dev libkf5filemetadata-dev libkf5crash-dev libglib2.0-dev libgtk2.0-dev libgdk-pixbuf2.0-dev libcanberra-dev libgsound-dev libgtk-3-dev libcairo2-dev libthunarx-3-dev libcanberra-gtk3-dev libnautilus-extension-dev libgtk-4-dev lcov
sudo apt-get install --yes cmake ninja-build libcurl4-openssl-dev zlib1g-dev libpng-dev libjpeg-dev nettle-dev pkg-config libpugixml-dev gettext libseccomp-dev libfmt-dev libzstd-dev liblz4-dev liblzo2-dev qtbase5-dev qttools5-dev-tools extra-cmake-modules libkf5kio-dev libkf5widgetsaddons-dev libkf5filemetadata-dev libkf5crash-dev libglib2.0-dev libgtk2.0-dev libgdk-pixbuf2.0-dev libcanberra-dev libgsound-dev libgtk-3-dev libcairo2-dev libthunarx-3-dev libcanberra-gtk3-dev libnautilus-extension-dev libgtk-4-dev lcov
- name: Run CMake
run: cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_XFCE=ON -DBUILD_GTK3=ON -DBUILD_GTK4=ON -DBUILD_KF5=ON -DBUILD_TESTING=ON -DENABLE_COVERAGE=ON -DTRACKER_INSTALL_API_VERSION=3 -G Ninja
- name: Run Ninja

2
.github/workflows/codeql-analysis.yml vendored
View File

@ -56,7 +56,7 @@ jobs:
#if: matrix.os == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install cmake ninja-build libcurl4-openssl-dev zlib1g-dev libpng-dev libjpeg-dev nettle-dev pkg-config libtinyxml2-dev gettext libseccomp-dev libfmt-dev libzstd-dev liblz4-dev liblzo2-dev qtbase5-dev qttools5-dev-tools extra-cmake-modules libkf5kio-dev libkf5widgetsaddons-dev libkf5filemetadata-dev libkf5crash-dev libglib2.0-dev libgtk2.0-dev libgdk-pixbuf2.0-dev libcanberra-dev libgsound-dev libgtk-3-dev libcairo2-dev libthunarx-3-dev libcanberra-gtk3-dev libglib2.0-dev libgtk-3-dev libcairo2-dev libnautilus-extension-dev libgtk-4-dev
sudo apt-get install cmake ninja-build libcurl4-openssl-dev zlib1g-dev libpng-dev libjpeg-dev nettle-dev pkg-config libpugixml-dev gettext libseccomp-dev libfmt-dev libzstd-dev liblz4-dev liblzo2-dev qtbase5-dev qttools5-dev-tools extra-cmake-modules libkf5kio-dev libkf5widgetsaddons-dev libkf5filemetadata-dev libkf5crash-dev libglib2.0-dev libgtk2.0-dev libgdk-pixbuf2.0-dev libcanberra-dev libgsound-dev libgtk-3-dev libcairo2-dev libthunarx-3-dev libcanberra-gtk3-dev libglib2.0-dev libgtk-3-dev libcairo2-dev libnautilus-extension-dev libgtk-4-dev
- name: Build rom-properties (Release build)
run: |

2
CMakeLists.txt
View File

@ -365,7 +365,7 @@ ENDIF(USE_INTERNAL_LZO)
SET(EXTLIB_BUILD "${EXTLIB_BUILD}- minizip-ng\n")
SET(EXTLIB_BUILD "${EXTLIB_BUILD}- inih\n")
IF(USE_INTERNAL_XML)
SET(EXTLIB_BUILD "${EXTLIB_BUILD}- TinyXML2\n")
SET(EXTLIB_BUILD "${EXTLIB_BUILD}- PugiXML\n")
ENDIF(USE_INTERNAL_XML)
IF(BUILD_TESTING)
SET(EXTLIB_BUILD "${EXTLIB_BUILD}- Google Test\n")

2
README.md
View File

@ -339,7 +339,7 @@ Some bundled components have other licenses:
* minizip-ng: zlib
* PowerVR: MIT
* rapidjson: MIT
* TinyXML2: BSD 3-clause
* PugiXML: MIT
* unice68: GPL-3
* uniwidth: LPGL-2.1+
* zlib-ng: zlib

8
cmake/libs/CheckPugiXML.cmake
View File

@ -1,14 +1,14 @@
# Check for PugiXML.
# If PugiXML isn't found, extlib/tinyxml2/ will be used instead.
# If PugiXML isn't found, extlib/pugixml/ will be used instead.
IF(ENABLE_XML)
IF(NOT USE_INTERNAL_XML)
IF(PugiXML_LIBRARY MATCHES "^pugixml")
IF(pugixml_LIBRARY MATCHES "^pugixml")
# Internal PugiXML was previously in use.
UNSET(XML_FOUND)
UNSET(HAVE_XML)
UNSET(PugiXML_LIBRARY CACHE)
UNSET(pugixml_LIBRARY CACHE)
ENDIF()
# Check for PugiXML.
@ -29,7 +29,7 @@ ENDIF(NOT USE_INTERNAL_XML)
IF(USE_INTERNAL_XML)
# Using the internal PugiXML library.
# NOTE: The tinyxml2 target has implicit include directories,
# NOTE: The pugixml target has implicit include directories,
# so we don't need to set the variables.
SET(pugixml_FOUND 1)
SET(HAVE_XML 1)

2
cmake/options.cmake
View File

@ -56,7 +56,7 @@ IF(WIN32)
ELSE(WIN32)
OPTION(USE_INTERNAL_ZLIB "Use the internal copy of zlib." OFF)
OPTION(USE_INTERNAL_PNG "Use the internal copy of libpng." OFF)
OPTION(USE_INTERNAL_XML "Use the internal copy of TinyXML2." OFF)
OPTION(USE_INTERNAL_XML "Use the internal copy of PugiXML." OFF)
OPTION(USE_INTERNAL_ZSTD "Use the internal copy of zstd." OFF)
OPTION(USE_INTERNAL_LZ4 "Use the internal copy of LZ4." OFF)
OPTION(USE_INTERNAL_LZO "Use the internal copy of LZO." OFF)