53 lines
2.2 KiB
Diff
53 lines
2.2 KiB
Diff
--- modules/QtPDF/CMake/Modules/FindPoppler.cmake.orig 2017-04-29 18:23:51.000000000 +0200
|
|
+++ modules/QtPDF/CMake/Modules/FindPoppler.cmake 2018-08-29 09:13:02.788284947 +0200
|
|
@@ -69,15 +69,7 @@
|
|
MESSAGE(STATUS "Could not find libpoppler." )
|
|
ENDIF ()
|
|
|
|
-# Scan poppler libraries for dependencies on Fontconfig
|
|
-INCLUDE(GetPrerequisites)
|
|
-MARK_AS_ADVANCED(gp_cmd)
|
|
-GET_PREREQUISITES("${POPPLER_BASE_LIBRARIES}" POPPLER_PREREQS TRUE FALSE "" "")
|
|
-IF ("${POPPLER_PREREQS}" MATCHES "fontconfig")
|
|
- SET(POPPLER_NEEDS_FONTCONFIG TRUE)
|
|
-ELSE ()
|
|
- SET(POPPLER_NEEDS_FONTCONFIG FALSE)
|
|
-ENDIF ()
|
|
+SET(POPPLER_NEEDS_FONTCONFIG TRUE)
|
|
|
|
|
|
FIND_PATH(POPPLER_QT_INCLUDE_DIR NAMES poppler-qt${QT_VERSION_MAJOR}.h poppler-link.h
|
|
--- CMakeLists.txt.orig 2017-04-29 18:23:51.000000000 +0200
|
|
+++ CMakeLists.txt 2018-08-29 10:49:36.290088209 +0200
|
|
@@ -91,7 +91,6 @@
|
|
SET(TeXworks_VERSION ${TeXworks_VER_MAJOR}.${TeXworks_VER_MINOR}.${TeXworks_VER_PATCH})
|
|
|
|
# Make sure we have up-to-date git commit infos
|
|
-IF ( NOT CMAKE_CROSSCOMPILING )
|
|
IF ( WIN32 )
|
|
EXECUTE_PROCESS(COMMAND ${CMAKE_SOURCE_DIR}/getGitRevInfo.bat WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
|
|
ADD_CUSTOM_TARGET(GitRev ALL COMMAND ${CMAKE_SOURCE_DIR}/getGitRevInfo.bat WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMENT "Update git commit info")
|
|
@@ -99,7 +98,6 @@
|
|
EXECUTE_PROCESS(COMMAND ${CMAKE_SOURCE_DIR}/getGitRevInfo.sh WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
|
|
ADD_CUSTOM_TARGET(GitRev ALL COMMAND ${CMAKE_SOURCE_DIR}/getGitRevInfo.sh WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMENT "Update git commit info")
|
|
ENDIF ( WIN32 )
|
|
-ENDIF ( NOT CMAKE_CROSSCOMPILING)
|
|
MESSAGE( STATUS "Git commit info updated" )
|
|
|
|
# Recover git commit info from `src/GitRev.h`.
|
|
@@ -361,7 +359,6 @@
|
|
# Some header files contain components that must be dynamically generated. For
|
|
# example, `getDefaultBinPaths.sh` is a script that tries to figure out the
|
|
# appropriate path to TeX binaries on UNIX-like systems.
|
|
-IF ( UNIX AND NOT CMAKE_CROSSCOMPILING )
|
|
IF ( NOT EXISTS ${TeXworks_SOURCE_DIR}/src/DefaultBinaryPaths.h )
|
|
MESSAGE(STATUS "Generating DefaultBinaryPaths.h")
|
|
|
|
@@ -371,7 +368,6 @@
|
|
WORKING_DIRECTORY ${TeXworks_SOURCE_DIR}
|
|
)
|
|
ENDIF ()
|
|
-ENDIF ()
|
|
|
|
# Building
|
|
# ========
|