Commit 27d99f58 authored by Hans-Christian Ebke's avatar Hans-Christian Ebke

Another Qt5 fix.

git-svn-id: http://www.openflipper.org/svnrepo/CoMISo/trunk@263 1355f012-dd97-4b2f-ae87-10fa9f823a57
parent 30221b93
......@@ -302,7 +302,7 @@ endif ()
acg_append_files (headers "*.hh" ${directories})
acg_append_files (sources "*.cc" ${directories})
if( QT4_FOUND)
if( QT4_FOUND OR QT5_FOUND )
acg_append_files (ui "*.ui" ${directories})
endif()
......@@ -324,11 +324,16 @@ of_list_filter ( sources )
# remove template cc files from source file list
acg_drop_templates (sources)
if( QT4_FOUND)
if( QT4_FOUND )
# genereate uic and moc targets
acg_qt4_autouic (uic_targets ${ui})
acg_qt4_automoc (moc_targets ${headers})
list (APPEND COMISO_LINK_LIBRARIES ${QT_LIBRARIES})
elsif ( QT5_FOUND )
# genereate uic and moc targets
acg_qt5_autouic (uic_targets ${ui})
acg_qt5_automoc (moc_targets ${headers})
list (APPEND COMISO_LINK_LIBRARIES ${QT_LIBRARIES})
endif()
acg_add_library (CoMISo SHARED ${uic_targets} ${sources} ${headers} ${moc_targets})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment