"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "xpdf-qt/CMakeLists.txt" between
xpdf-4.03.tar.gz and xpdf-4.04.tar.gz

About: Xpdf is a PDF viewer for X.

CMakeLists.txt  (xpdf-4.03):CMakeLists.txt  (xpdf-4.04)
#======================================================================== #========================================================================
# #
# xpdf-qt/cmake-xpdf.txt # xpdf-qt/cmake-xpdf.txt
# #
# CMake script for the xpdf application. # CMake script for the xpdf application.
# #
# Copyright 2015 Glyph & Cog, LLC # Copyright 2015 Glyph & Cog, LLC
# #
#======================================================================== #========================================================================
if ((QT4_FOUND OR Qt5Widgets_FOUND) if ((QT4_FOUND OR Qt5Widgets_FOUND OR Qt6Widgets_FOUND)
AND HAVE_SPLASH AND MULTITHREADED AND USE_EXCEPTIONS) AND HAVE_SPLASH AND MULTITHREADED AND USE_EXCEPTIONS)
include_directories("${PROJECT_SOURCE_DIR}") include_directories("${PROJECT_SOURCE_DIR}")
include_directories("${PROJECT_BINARY_DIR}") include_directories("${PROJECT_BINARY_DIR}")
include_directories("${PROJECT_SOURCE_DIR}/goo") include_directories("${PROJECT_SOURCE_DIR}/goo")
include_directories("${PROJECT_SOURCE_DIR}/fofi") include_directories("${PROJECT_SOURCE_DIR}/fofi")
include_directories("${PROJECT_SOURCE_DIR}/splash") include_directories("${PROJECT_SOURCE_DIR}/splash")
include_directories("${PROJECT_SOURCE_DIR}/xpdf") include_directories("${PROJECT_SOURCE_DIR}/xpdf")
if (QT4_FOUND) if (QT4_FOUND)
include(${QT_USE_FILE}) include(${QT_USE_FILE})
else () else ()
skipping to change at line 33 skipping to change at line 33
add_definitions(${QT_DEFINITIONS}) add_definitions(${QT_DEFINITIONS})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QT_CFLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QT_CFLAGS}")
endif () endif ()
cmake_policy(SET CMP0020 NEW) cmake_policy(SET CMP0020 NEW)
if (Qt5Widgets_FOUND AND NOT (Qt5Widgets_VERSION VERSION_LESS 5.7.0)) if (Qt5Widgets_FOUND AND NOT (Qt5Widgets_VERSION VERSION_LESS 5.7.0))
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
endif () endif ()
if (WIN32)
set(XPDF_MANIFEST "${PROJECT_SOURCE_DIR}/xpdf/winLongPath.exe.manifest")
else ()
set(XPDF_MANIFEST "")
endif ()
if (XPDFWIDGET_PRINTING) if (XPDFWIDGET_PRINTING)
if (WIN32) if (WIN32)
if (EXISTS ${PROJECT_SOURCE_DIR}/xpdf/WinPDFPrinter.cc) if (EXISTS ${PROJECT_SOURCE_DIR}/xpdf/WinPDFPrinter.cc)
add_definitions(-DXPDFWIDGET_PRINTING=1) add_definitions(-DXPDFWIDGET_PRINTING=1)
add_definitions(-DXPDFWIDGET_WIN32_PRINTING=1) add_definitions(-DXPDFWIDGET_WIN32_PRINTING=1)
set(XPDFWIDGET_PRINT_MODULES XpdfWidgetPrint.cc set(XPDFWIDGET_PRINT_MODULES XpdfWidgetPrint.cc
${PROJECT_SOURCE_DIR}/xpdf/GDIOutputDev.cc ${PROJECT_SOURCE_DIR}/xpdf/GDIOutputDev.cc
${PROJECT_SOURCE_DIR}/xpdf/WinPDFPrinter.cc ) ${PROJECT_SOURCE_DIR}/xpdf/WinPDFPrinter.cc )
endif () endif ()
else () else ()
skipping to change at line 55 skipping to change at line 61
endif () endif ()
else () else ()
set(XPDFWIDGET_PRINT_MODULES "") set(XPDFWIDGET_PRINT_MODULES "")
endif () endif ()
if (QT4_FOUND) if (QT4_FOUND)
qt4_wrap_cpp(XPDFWIDGET_MOC XpdfWidget.h) qt4_wrap_cpp(XPDFWIDGET_MOC XpdfWidget.h)
qt4_wrap_cpp(XPDFVIEWER_MOC XpdfViewer.h) qt4_wrap_cpp(XPDFVIEWER_MOC XpdfViewer.h)
qt4_wrap_cpp(XPDFAPP_MOC XpdfApp.h) qt4_wrap_cpp(XPDFAPP_MOC XpdfApp.h)
qt4_add_resources(XPDF_ICONS icons.qrc) qt4_add_resources(XPDF_ICONS icons.qrc)
else () elseif (Qt5Widgets_FOUND)
qt5_wrap_cpp(XPDFWIDGET_MOC XpdfWidget.h) qt5_wrap_cpp(XPDFWIDGET_MOC XpdfWidget.h)
qt5_wrap_cpp(XPDFVIEWER_MOC XpdfViewer.h) qt5_wrap_cpp(XPDFVIEWER_MOC XpdfViewer.h)
qt5_wrap_cpp(XPDFAPP_MOC XpdfApp.h) qt5_wrap_cpp(XPDFAPP_MOC XpdfApp.h)
qt5_add_resources(XPDF_ICONS icons.qrc) qt5_add_resources(XPDF_ICONS icons.qrc)
else ()
qt6_wrap_cpp(XPDFWIDGET_MOC XpdfWidget.h)
qt6_wrap_cpp(XPDFVIEWER_MOC XpdfViewer.h)
qt6_wrap_cpp(XPDFAPP_MOC XpdfApp.h)
qt6_add_resources(XPDF_ICONS icons.qrc)
endif () endif ()
# workaround for a conflict between the Qt5 QDateTime and windows.h # workaround for a conflict between the Qt5/6 QDateTime and windows.h
if (WIN32) if (WIN32)
add_definitions(-DNOMINMAX) add_definitions(-DNOMINMAX)
endif () endif ()
add_executable(xpdf add_executable(xpdf
$<TARGET_OBJECTS:goo_objs> $<TARGET_OBJECTS:goo_objs>
$<TARGET_OBJECTS:fofi_objs> $<TARGET_OBJECTS:fofi_objs>
$<TARGET_OBJECTS:splash_objs> $<TARGET_OBJECTS:splash_objs>
$<TARGET_OBJECTS:xpdf_objs> $<TARGET_OBJECTS:xpdf_objs>
$<TARGET_OBJECTS:xpdf_widget_objs> $<TARGET_OBJECTS:xpdf_widget_objs>
skipping to change at line 84 skipping to change at line 95
QtPDFCore.cc QtPDFCore.cc
XpdfApp.cc XpdfApp.cc
XpdfViewer.cc XpdfViewer.cc
XpdfWidget.cc XpdfWidget.cc
xpdf.cc xpdf.cc
xpdf.rc xpdf.rc
${XPDFAPP_MOC} ${XPDFAPP_MOC}
${XPDFVIEWER_MOC} ${XPDFVIEWER_MOC}
${XPDFWIDGET_MOC} ${XPDFWIDGET_MOC}
${XPDF_ICONS} ${XPDF_ICONS}
${XPDF_MANIFEST}
) )
target_link_libraries(xpdf ${QT_LIBRARIES} ${EXTRA_QT_LIBRARIES} target_link_libraries(xpdf ${QT_LIBRARIES} ${EXTRA_QT_LIBRARIES}
${PAPER_LIBRARY} ${PAPER_LIBRARY}
${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS} ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS}
${DTYPE_LIBRARY} ${DTYPE_LIBRARY}
${LCMS_LIBRARY} ${LCMS_LIBRARY}
${FONTCONFIG_LIBRARY} ${FONTCONFIG_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}) ${CMAKE_THREAD_LIBS_INIT})
set_property(TARGET xpdf PROPERTY WIN32_EXECUTABLE 1) set_property(TARGET xpdf PROPERTY WIN32_EXECUTABLE 1)
if (QT4_FOUND) if (QT4_FOUND)
set_property(TARGET xpdf PROPERTY QT4_NO_LINK_QTMAIN ON) set_property(TARGET xpdf PROPERTY QT4_NO_LINK_QTMAIN ON)
else () elseif (Qt5Widgets_FOUND)
set_property(TARGET xpdf PROPERTY Qt5_NO_LINK_QTMAIN ON) set_property(TARGET xpdf PROPERTY Qt5_NO_LINK_QTMAIN ON)
else ()
set_property(TARGET xpdf PROPERTY Qt6_NO_LINK_QTMAIN ON)
endif () endif ()
install(TARGETS xpdf RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) install(TARGETS xpdf RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
install(FILES ${PROJECT_SOURCE_DIR}/doc/xpdf.1 DESTINATION ${CMAKE_INSTALL_MAN DIR}/man1) install(FILES ${PROJECT_SOURCE_DIR}/doc/xpdf.1 DESTINATION ${CMAKE_INSTALL_MAN DIR}/man1)
endif () endif ()
 End of changes. 8 change blocks. 
4 lines changed or deleted 18 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)