Skip to content

Commit

Permalink
libs(qt6): vendor xerces-c for windows and mac builds
Browse files Browse the repository at this point in the history
  • Loading branch information
csett86 committed Aug 10, 2023
1 parent 30a62cc commit 81ed649
Show file tree
Hide file tree
Showing 1,413 changed files with 214,951 additions and 362 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,6 @@ jobs:
cache: true
modules: qt5compat qtmultimedia

- name: install build dependencies
run: |
brew install xerces-c
- name: update version
run: |
./scripts/version.sh ${VERSION_NUMBER}
Expand Down
2 changes: 0 additions & 2 deletions common.pri
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ win32{
QMAKE_INSTALL_PROGRAM = xcopy /y

VCOPY = $$QMAKE_COPY /D

INSTALL_XERCES += ../../../extern/xerces-c/lib/xerces-c_3_2D.dll
}

unix{
Expand Down

This file was deleted.

This file was deleted.

Binary file removed extern/xerces-c/lib/xerces-c_3D.lib
Binary file not shown.
Binary file removed extern/xerces-c/lib/xerces-c_3_2D.dll
Binary file not shown.
14 changes: 4 additions & 10 deletions src/app/seamly2d/seamly2d.pro
Original file line number Diff line number Diff line change
Expand Up @@ -206,13 +206,6 @@ win32 {
openssl_path += $${PWD}/$$DIR
}
copyToDestdir($$openssl_path, $$shell_path($${OUT_PWD}/$$DESTDIR))

for(DIR, INSTALL_XERCES) {
#add these absolute paths to a variable which
#ends up as 'mkcommands = path1 path2 path3 ...'
openssl_path += $${PWD}/$$DIR
}
copyToDestdir($$openssl_path, $$shell_path($${OUT_PWD}/$$DESTDIR))
}

# When the GNU linker sees a library, it discards all symbols that it doesn't need.
Expand Down Expand Up @@ -337,9 +330,10 @@ win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpropertyexplorer/$${DE
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpropertyexplorer/$${DESTDIR}/libvpropertyexplorer.a

# xerces library
win32: LIBS += -L$$PWD/../../../extern/xerces-c/lib/ -lxerces-c_3D
macx: LIBS += -L/usr/local/lib -lxerces-c-3.2
else:unix|win32-g++: LIBS += -lxerces-c-3.2
macx: LIBS += -L$${PWD}/../../libs/xerces-c/macx/lib -lxerces-c
else:unix: LIBS += -lxerces-c
win32:!win32-g++: LIBS += -L$${PWD}/../../libs/xerces-c/msvc/lib -lxerces-c_3
win32-g++: LIBS += -L$${PWD}/../../libs/xerces-c/mingw/lib -lxerces-c

macx{
APPLE_SIGN_IDENTITY_UNQUOTED = $(APPLE_SIGN_IDENTITY)
Expand Down
14 changes: 4 additions & 10 deletions src/app/seamlyme/seamlyme.pro
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,6 @@ win32 {
openssl_path += $${PWD}/$$DIR
}
copyToDestdir($$openssl_path, $$shell_path($${OUT_PWD}/$$DESTDIR))

for(DIR, INSTALL_XERCES) {
#add these absolute paths to a variable which
#ends up as 'mkcommands = path1 path2 path3 ...'
xerces_path += $${PWD}/$$DIR
}
copyToDestdir($$xerces_path, $$shell_path($${OUT_PWD}/$$DESTDIR))
}

# Compilation will fail without this files after we added them to this section.
Expand Down Expand Up @@ -238,9 +231,10 @@ win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpropertyexplorer/$${DE
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpropertyexplorer/$${DESTDIR}/libvpropertyexplorer.a

# xerces library
win32: LIBS += -L$$PWD/../../../extern/xerces-c/lib/ -lxerces-c_3D
macx: LIBS += -L/usr/local/lib -lxerces-c-3.2
else:unix|win32-g++: LIBS += -lxerces-c-3.2
macx: LIBS += -L$${PWD}/../../libs/xerces-c/macx/lib -lxerces-c
else:unix: LIBS += -lxerces-c
win32:!win32-g++: LIBS += -L$${PWD}/../../libs/xerces-c/msvc/lib -lxerces-c_3
win32-g++: LIBS += -L$${PWD}/../../libs/xerces-c/mingw/lib -lxerces-c

macx{
APPLE_SIGN_IDENTITY = $$shell_quote($(APPLE_SIGN_IDENTITY))
Expand Down
8 changes: 4 additions & 4 deletions src/libs/libs.pri
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ INCLUDEPATH += $${PWD}/vpropertyexplorer
#VTools static library
INCLUDEPATH += $${PWD}/vtest

#xerces shared library, bundled on windows locally
win32:INCLUDEPATH += $${PWD}/../../extern/xerces-c/include
#xerces static library, vendored for msvc, mingw and mac locally
win32:!win32-g++:INCLUDEPATH += $${PWD}/xerces-c/msvc/include
win32-g++:INCLUDEPATH += $${PWD}/xerces-c/mingw/include
macx:INCLUDEPATH += $${PWD}/xerces-c/macx/include
#xerces headers and library on linux via package manager, no extra include path required
#xerces headers and library on mac via brew
macx:INCLUDEPATH += /usr/local/include
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 81ed649

Please sign in to comment.