aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-27 01:06:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: Compilation with Qt 5 static under Linux

Browse source
This commit is contained in:
kervala 2015-12-21 14:20:36 +01:00
parent 5060102810
commit ec1ee961e8
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
code/CMakeLists.txt
View file

@ -270,7 +270,7 @@ IF(WITH_QT5)
FIND_LIBRARY(SYSTEMCONFIGURATION_FRAMEWORK SystemConfiguration) FIND_LIBRARY(SYSTEMCONFIGURATION_FRAMEWORK SystemConfiguration)
FIND_LIBRARY(OPENGL_FRAMEWORK NAMES OpenGL) FIND_LIBRARY(OPENGL_FRAMEWORK NAMES OpenGL)
SET(QT_LIBRARIES ${QT_LIBRARIES} SET(QT_LIBRARIES ${QT_LIBRARIES}
${CUPS_LIBRARY} ${CUPS_LIBRARY}
${COCOA_FRAMEWORK} ${COCOA_FRAMEWORK}
${SYSTEMCONFIGURATION_FRAMEWORK} ${SYSTEMCONFIGURATION_FRAMEWORK}
@ -279,6 +279,10 @@ IF(WITH_QT5)
ADD_QT_PLUGIN(printsupport cocoaprintersupport) ADD_QT_PLUGIN(printsupport cocoaprintersupport)
ADD_QT_PLUGIN(platforms qcocoa) ADD_QT_PLUGIN(platforms qcocoa)
ELSE()
FIND_LIBRARY(OPENGL_LIBRARY GL)
SET(QT_LIBRARIES ${QT_LIBRARIES} ${OPENGL_LIBRARY})
ENDIF() ENDIF()
ADD_QT_PLUGIN(imageformats qgif) ADD_QT_PLUGIN(imageformats qgif)
@ -289,7 +293,7 @@ IF(WITH_QT5)
ADD_QT_PLUGIN(imageformats qwebp) ADD_QT_PLUGIN(imageformats qwebp)
# harfbuzz is needed since Qt 5.3 # harfbuzz is needed since Qt 5.3
IF(APPLE) IF(UNIX)
SET(HB_LIB "${QT_LIBRARY_DIR}/libqtharfbuzzng.a") SET(HB_LIB "${QT_LIBRARY_DIR}/libqtharfbuzzng.a")
ELSEIF(WIN32) ELSEIF(WIN32)
SET(HB_LIB "${QT_LIBRARY_DIR}/qtharfbuzzng.lib") SET(HB_LIB "${QT_LIBRARY_DIR}/qtharfbuzzng.lib")
@ -299,7 +303,7 @@ IF(WITH_QT5)
ENDIF() ENDIF()
# freetype is needed since Qt 5.5 # freetype is needed since Qt 5.5
IF(APPLE) IF(UNIX)
SET(FREETYPE_LIB "${QT_LIBRARY_DIR}/libqtfreetype.a") SET(FREETYPE_LIB "${QT_LIBRARY_DIR}/libqtfreetype.a")
ELSEIF(WIN32) ELSEIF(WIN32)
SET(FREETYPE_LIB "${QT_LIBRARY_DIR}/qtfreetype.lib") SET(FREETYPE_LIB "${QT_LIBRARY_DIR}/qtfreetype.lib")
@ -309,7 +313,7 @@ IF(WITH_QT5)
ENDIF() ENDIF()
# pcre is needed since Qt 5.5 # pcre is needed since Qt 5.5
IF(APPLE) IF(UNIX)
SET(PCRE_LIB "${QT_LIBRARY_DIR}/libqtpcre.a") SET(PCRE_LIB "${QT_LIBRARY_DIR}/libqtpcre.a")
ELSEIF(WIN32) ELSEIF(WIN32)
SET(PCRE_LIB "${QT_LIBRARY_DIR}/qtpcre.lib") SET(PCRE_LIB "${QT_LIBRARY_DIR}/qtpcre.lib")

2
code/CMakeModules/PCHSupport.cmake
View file

@ -151,7 +151,7 @@ MACRO(PCH_SET_COMPILE_FLAGS _target)
ENDIF() ENDIF()
# Qt5_POSITION_INDEPENDENT_CODE should be true if Qt was compiled with PIE # Qt5_POSITION_INDEPENDENT_CODE should be true if Qt was compiled with PIE
IF(Qt5_POSITION_INDEPENDENT_CODE) IF(Qt5_POSITION_INDEPENDENT_CODE AND GLOBAL_DEFINITIONS MATCHES "QT_CORE_LIB")
SET(_USE_PIE ON) SET(_USE_PIE ON)
ENDIF() ENDIF()