Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

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

10
code/CMakeLists.txt
View file

@ -283,6 +283,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)
@ -293,7 +297,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")
@ -303,7 +307,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")
@ -313,7 +317,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()