From: <ibr...@us...> - 2014-11-24 20:03:30
|
Revision: 5165 http://sourceforge.net/p/tora/code/5165 Author: ibre5041 Date: 2014-11-24 20:03:21 +0000 (Mon, 24 Nov 2014) Log Message: ----------- Experimental support for QT5 Modified Paths: -------------- trunk/tora/extlibs/qscintilla2/CMakeLists.txt Modified: trunk/tora/extlibs/qscintilla2/CMakeLists.txt =================================================================== --- trunk/tora/extlibs/qscintilla2/CMakeLists.txt 2014-11-24 20:02:56 UTC (rev 5164) +++ trunk/tora/extlibs/qscintilla2/CMakeLists.txt 2014-11-24 20:03:21 UTC (rev 5165) @@ -15,7 +15,11 @@ FILE(GLOB TORA_QSCINTILLA2_LIB_SOURCES "lexers/*.cpp" "lexlib/*.cpp" "Qt4Qt5/*.cpp" "src/*.cpp") +if(QT5_BUILD) +QT5_WRAP_CPP(TORA_QSCINTILLA2_MOC_SOURCES ${TORA_QSCINTILLA2_MOC_CLASSES}) +else() QT4_WRAP_CPP(TORA_QSCINTILLA2_MOC_SOURCES ${TORA_QSCINTILLA2_MOC_CLASSES}) +endif() SET(TORA_QSCINTILLA2_LIB "tora_qscintilla2_lib") ADD_LIBRARY(${TORA_QSCINTILLA2_LIB} STATIC ${TORA_QSCINTILLA2_LIB_SOURCES} ${TORA_QSCINTILLA2_MOC_SOURCES}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |