Issue #118: Header files and installer fixes

This commit is contained in:
Jakub Melka 2023-12-08 11:54:12 +01:00
parent 642e6a9bb7
commit 3004618992
8 changed files with 105 additions and 8 deletions

View File

@ -1,4 +1,4 @@
# Copyright (C) 2022 Jakub Melka
# Copyright (C) 2022-2023 Jakub Melka
#
# This file is part of PDF4QT.
#
@ -17,8 +17,10 @@
add_executable(CodeGenerator
codegenerator.cpp
codegenerator.h
main.cpp
generatormainwindow.cpp
generatormainwindow.h
generatormainwindow.ui
)

View File

@ -1,4 +1,4 @@
# Copyright (C) 2022 Jakub Melka
# Copyright (C) 2022-2023 Jakub Melka
#
# This file is part of PDF4QT.
#
@ -18,6 +18,7 @@
add_executable(JBIG2_VIEWER
mainwindow.ui
mainwindow.cpp
mainwindow.h
main.cpp
)

View File

@ -1,4 +1,4 @@
# Copyright (C) 2022 Jakub Melka
# Copyright (C) 2022-2023 Jakub Melka
#
# This file is part of PDF4QT.
#
@ -17,11 +17,16 @@
add_executable(Pdf4QtDocDiff
aboutdialog.cpp
aboutdialog.h
differencesdockwidget.cpp
differencesdockwidget.h
main.cpp
mainwindow.cpp
mainwindow.h
settingsdockwidget.cpp
settingsdockwidget.h
utils.cpp
utils.h
aboutdialog.ui
differencesdockwidget.ui
mainwindow.ui

View File

@ -1,4 +1,4 @@
# Copyright (C) 2022 Jakub Melka
# Copyright (C) 2022-2023 Jakub Melka
#
# This file is part of PDF4QT.
#
@ -17,12 +17,18 @@
add_executable(Pdf4QtDocPageOrganizer
aboutdialog.cpp
aboutdialog.h
assembleoutputsettingsdialog.cpp
assembleoutputsettingsdialog.h
main.cpp
mainwindow.cpp
mainwindow.h
pageitemdelegate.cpp
pageitemdelegate.h
pageitemmodel.cpp
pageitemmodel.h
selectbookmarkstoregroupdialog.cpp
selectbookmarkstoregroupdialog.h
aboutdialog.ui
assembleoutputsettingsdialog.ui
mainwindow.ui

View File

@ -17,63 +17,121 @@
add_library(Pdf4QtLibCore SHARED
sources/pdfaction.cpp
sources/pdfaction.h
sources/pdfalgorithmlcs.cpp
sources/pdfalgorithmlcs.h
sources/pdfannotation.cpp
sources/pdfannotation.h
sources/pdfblendfunction.cpp
sources/pdfblendfunction.h
sources/pdfccittfaxdecoder.cpp
sources/pdfccittfaxdecoder.h
sources/pdfcertificatemanager.cpp
sources/pdfcertificatemanager.h
sources/pdfcms.cpp
sources/pdfcms.h
sources/pdfdiff.cpp
sources/pdfdiff.h
sources/pdfdocumentbuilder.cpp
sources/pdfdocumentbuilder.h
sources/pdfdocumentmanipulator.cpp
sources/pdfdocumentmanipulator.h
sources/pdfdocumenttextflow.cpp
sources/pdfdocumenttextflow.h
sources/pdfdocumenttextfloweditormodel.cpp
sources/pdfdocumenttextfloweditormodel.h
sources/pdfdocumentwriter.cpp
sources/pdfdocumentwriter.h
sources/pdfexecutionpolicy.cpp
sources/pdfexecutionpolicy.h
sources/pdffile.cpp
sources/pdffile.h
sources/pdfform.cpp
sources/pdfform.h
sources/pdficontheme.cpp
sources/pdficontheme.h
sources/pdfjavascriptscanner.cpp
sources/pdfjavascriptscanner.h
sources/pdfjbig2decoder.cpp
sources/pdfjbig2decoder.h
sources/pdfmultimedia.cpp
sources/pdfmultimedia.h
sources/pdfobject.cpp
sources/pdfobject.h
sources/pdfobjecteditormodel.cpp
sources/pdfobjecteditormodel.h
sources/pdfobjectutils.cpp
sources/pdfobjectutils.h
sources/pdfoptimizer.cpp
sources/pdfoptimizer.h
sources/pdfoptionalcontent.cpp
sources/pdfoptionalcontent.h
sources/pdfoutline.cpp
sources/pdfoutline.h
sources/pdfpagenavigation.cpp
sources/pdfpagenavigation.h
sources/pdfpagetransition.cpp
sources/pdfpagetransition.h
sources/pdfpainterutils.cpp
sources/pdfpainterutils.h
sources/pdfparser.cpp
sources/pdfparser.h
sources/pdfdocument.cpp
sources/pdfdocument.h
sources/pdfdocumentreader.cpp
sources/pdfdocumentreader.h
sources/pdfpattern.cpp
sources/pdfpattern.h
sources/pdfplugin.cpp
sources/pdfplugin.h
sources/pdfprogress.cpp
sources/pdfprogress.h
sources/pdfredact.cpp
sources/pdfredact.h
sources/pdfsecurityhandler.cpp
sources/pdfsecurityhandler.h
sources/pdfsignaturehandler.cpp
sources/pdfsignaturehandler.h
sources/pdfsnapper.cpp
sources/pdfsnapper.h
sources/pdfstructuretree.cpp
sources/pdfstructuretree.h
sources/pdftextlayout.cpp
sources/pdftextlayout.h
sources/pdftransparencyrenderer.cpp
sources/pdftransparencyrenderer.h
sources/pdfutils.cpp
sources/pdfutils.h
sources/pdfxfaengine.cpp
sources/pdfxfaengine.h
sources/pdfxreftable.cpp
sources/pdfxreftable.h
sources/pdfvisitor.cpp
sources/pdfvisitor.h
sources/pdfencoding.cpp
sources/pdfencoding.h
sources/pdfcatalog.cpp
sources/pdfcatalog.h
sources/pdfpage.cpp
sources/pdfpage.h
sources/pdfstreamfilters.cpp
sources/pdfstreamfilters.h
sources/pdfcolorspaces.cpp
sources/pdfcolorspaces.h
sources/pdfrenderer.cpp
sources/pdfrenderer.h
sources/pdfpagecontentprocessor.cpp
sources/pdfpagecontentprocessor.h
sources/pdfpainter.cpp
sources/pdfpainter.h
sources/pdffunction.cpp
sources/pdffunction.h
sources/pdfnametounicode.cpp
sources/pdfnametounicode.h
sources/pdffont.cpp
sources/pdffont.h
sources/pdfimage.cpp
sources/pdfimage.h
sources/pdfdocumentsanitizer.h
sources/pdfdocumentsanitizer.cpp
sources/pdfimageconversion.h

View File

@ -1,4 +1,4 @@
# Copyright (C) 2022 Jakub Melka
# Copyright (C) 2022-2023 Jakub Melka
#
# This file is part of PDF4QT.
#
@ -17,23 +17,41 @@
add_library(Pdf4QtViewer SHARED
pdfaboutdialog.cpp
pdfaboutdialog.h
pdfadvancedfindwidget.cpp
pdfadvancedfindwidget.h
pdfdocumentpropertiesdialog.cpp
pdfdocumentpropertiesdialog.h
pdfencryptionsettingsdialog.cpp
pdfencryptionsettingsdialog.h
pdfencryptionstrengthhintwidget.cpp
pdfencryptionstrengthhintwidget.h
pdfoptimizedocumentdialog.cpp
pdfoptimizedocumentdialog.h
pdfprogramcontroller.cpp
pdfprogramcontroller.h
pdfrecentfilemanager.cpp
pdfrecentfilemanager.h
pdfrendertoimagesdialog.cpp
pdfrendertoimagesdialog.h
pdfsendmail.cpp
pdfsendmail.h
pdfsidebarwidget.cpp
pdfsidebarwidget.h
pdftexttospeech.cpp
pdftexttospeech.h
pdfundoredomanager.cpp
pdfundoredomanager.h
pdfviewermainwindow.cpp
pdfviewermainwindow.h
pdfviewermainwindowlite.cpp
pdfviewermainwindowlite.h
pdfviewersettings.cpp
pdfviewersettings.h
pdfviewersettingsdialog.cpp
pdfviewersettingsdialog.h
pdfwintaskbarprogress.cpp
pdfwintaskbarprogress.h
pdfaboutdialog.ui
pdfadvancedfindwidget.ui
pdfdocumentpropertiesdialog.ui

View File

@ -16,7 +16,11 @@
# along with PDF4QT. If not, see <https://www.gnu.org/licenses/>.
if(WIN32 AND MSVC AND PDF4QT_INSTALL_PREPARE_WIX_INSTALLER)
file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/bin" WIX_INSTALL_PREFIX)
if(PDF4QT_INSTALL_TO_USR)
file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/usr/bin" WIX_INSTALL_PREFIX)
else()
file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/bin" WIX_INSTALL_PREFIX)
endif()
file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/WixInstaller" PDF4QT_WIX_DIR)
configure_file(PDF4QT.sln.in PDF4QT.sln)

View File

@ -63,9 +63,12 @@
<Component Id="cmp2B0BBC8908FE104E7FE849B6C9361904" Directory="INSTALLFOLDER" Guid="{B0309455-5073-465A-B3C4-83CEAE720761}">
<File Id="filCC63CF9D6F210D0049D050EB06297019" KeyPath="yes" Source="$(var.MyInstallDir)\libssl-3-x64.dll" />
</Component>
<Component Id="cmpD902D80240D92E0BA5C21A7CBFFEB34D" Directory="INSTALLFOLDER" Guid="{E54B48ED-6C16-4501-B580-4B75A996BC9C}">
<File Id="fil0756A2ECB744DFD7A8F4B4CA126C0EBF" KeyPath="yes" Source="$(var.MyInstallDir)\Pdf4QtLib.dll" />
<Component Id="cmpPdf4QtLibCore" Directory="INSTALLFOLDER" Guid="{C8CFFAE9-F913-4103-BD46-A8299E42938E}">
<File Id="filPdf4QtLibCore" KeyPath="yes" Source="$(var.MyInstallDir)\Pdf4QtLibCore.dll" />
</Component>
<Component Id="cmpPdf4QtLibWidgets" Directory="INSTALLFOLDER" Guid="{40A714A4-3F2A-41BE-9C70-216FAB048061}">
<File Id="filPdf4QtLibWidgets" KeyPath="yes" Source="$(var.MyInstallDir)\Pdf4QtLibWidgets.dll" />
</Component>
<Component Id="cmpA99D3E7760DA61048DF14141B017863B" Directory="INSTALLFOLDER" Guid="{7EFA71AF-99EC-40D8-9C07-4B99EB3FAECB}">
<File Id="fil0CB615EFFEBF4E5461A1C353B0A551E2" KeyPath="yes" Source="$(var.MyInstallDir)\Pdf4QtViewer.dll" />
</Component>