Commit b951bbce authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum

[FIX #385] added Qt5 definitions and compile flags to openwalnut-qt5...

[FIX #385] added Qt5 definitions and compile flags to openwalnut-qt5 executable. This should fix some compile issues with the pre-compiled QT5 versions.
parent e0b25bb6
......@@ -12,6 +12,7 @@ syntax: regexp
^doc/developer/html
^doc/developer/man
^doc/developer/doxyerror.log
^doc/developer/doxygen_sqlite3.db
^doc/developer/developer.tag
^doc/developer/designDocuments/openWalnutDesign.aux
^doc/developer/designDocuments/openWalnutDesign.bbl
......
......@@ -54,6 +54,24 @@ INCLUDE_DIRECTORIES( SYSTEM ${Qt5WebKitWidgets_INCLUDE_DIRS} )
# GUI compilation options
# ---------------------------------------------------------------------------------------------------------------------------------------------------
# Compiling with Qt5 requires some special definitions and flags to be set.
# Collect and set definitions
SET( _QT5_DEFINITIONS "" )
LIST( APPEND _QT5_DEFINITIONS ${Qt5Widgets_DEFINITIONS} )
LIST( APPEND _QT5_DEFINITIONS ${Qt5OpenGL_DEFINITIONS} )
LIST( APPEND _QT5_DEFINITIONS ${Qt5WebKitWidgets_DEFINITIONS} )
LIST( REMOVE_DUPLICATES _QT5_DEFINITIONS )
ADD_DEFINITIONS( ${_QT5_DEFINITIONS} )
# Collect and set compiler flags
SET( _QT5_EXECUTABLE_COMPILE_FLAGS "" )
LIST( APPEND _QT5_EXECUTABLE_COMPILE_FLAGS ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS} )
LIST( APPEND _QT5_EXECUTABLE_COMPILE_FLAGS ${Qt5OpenGL_EXECUTABLE_COMPILE_FLAGS} )
LIST( APPEND _QT5_EXECUTABLE_COMPILE_FLAGS ${Qt5WebKitWidgets_EXECUTABLE_COMPILE_FLAGS} )
LIST( REMOVE_DUPLICATES _QT5_EXECUTABLE_COMPILE_FLAGS )
SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_QT5_EXECUTABLE_COMPILE_FLAGS}" )
# ---------------------------------------------------------------------------------------------------------------------------------------------------
# Add sources as target
# ---------------------------------------------------------------------------------------------------------------------------------------------------
......
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