aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-26 17:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-04-13 20:37:30 +02:00
commit 465609f942
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
code/CMakeLists.txt
View file

@ -328,13 +328,19 @@ IF(WITH_QT5)
ENDIF() ENDIF()
# freetype is needed since Qt 5.5 # freetype is needed since Qt 5.5
IF(UNIX) FIND_PACKAGE(FreeType)
SET(FREETYPE_LIB "${QT_LIBRARY_DIR}/libqtfreetype.a")
ELSEIF(WIN32) IF(FREETYPE_FOUND)
SET(FREETYPE_LIB "${QT_LIBRARY_DIR}/qtfreetype.lib") SET(QT_LIBRARIES ${QT_LIBRARIES} ${FREETYPE_LIBRARIES})
ENDIF() ELSE()
IF(EXISTS ${FREETYPE_LIB}) IF(UNIX)
SET(QT_LIBRARIES ${QT_LIBRARIES} ${FREETYPE_LIB}) SET(FREETYPE_LIB "${QT_LIBRARY_DIR}/libqtfreetype.a")
ELSEIF(WIN32)
SET(FREETYPE_LIB "${QT_LIBRARY_DIR}/qtfreetype.lib")
ENDIF()
IF(EXISTS ${FREETYPE_LIB})
SET(QT_LIBRARIES ${QT_LIBRARIES} ${FREETYPE_LIB})
ENDIF()
ENDIF() ENDIF()
ADD_QT_PLUGIN(accessible qtaccessiblewidgets) ADD_QT_PLUGIN(accessible qtaccessiblewidgets)