diff options
author | Jörg Mayer <jmayer@loplof.de> | 2013-04-25 23:04:19 +0000 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2013-04-25 23:04:19 +0000 |
commit | c3d7f57f58bcc7062b9b1bb8cc438e0b57806505 (patch) | |
tree | 798125b6fe067eaffa7ffaa891420b57a4bf44ab /CMakeLists.txt | |
parent | 7d2c6f30004ce23445c268fc8c7035fddac124b4 (diff) |
Add Qt5 build support with cmake. Just do cmake ... -DENABLE_QT5=ON ...
svn path=/trunk/; revision=49042
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b2e133780d..19032a7db0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -299,8 +299,14 @@ endif() # Build the Qt GUI? if(BUILD_qtshark) - set(PACKAGELIST ${PACKAGELIST} QT) - # set(QT_OPTIONS 4.7.1 REQUIRED QtCore QtGui) + if(ENABLE_QT5) + set(PACKAGELIST ${PACKAGELIST} Qt5Widgets Qt5PrintSupport Qt5LinguistTools) + set(QT_VERSION 5) + else() + set(PACKAGELIST ${PACKAGELIST} QT) + # set(QT_OPTIONS 4.7.1 REQUIRED QtCore QtGui) + set(QT_VERSION 5) + endif() endif() # SMI SNMP @@ -391,6 +397,9 @@ foreach(PACKAGE ${PACKAGELIST}) include_directories(${${PACKAGE}_INCLUDE_DIRS}) message(STATUS "${PACKAGE} includes: ${${PACKAGE}_INCLUDE_DIRS}") message(STATUS "${PACKAGE} libs: ${${PACKAGE}_LIBRARIES}") + if (${PACKAGE}_DEFINITIONS) + message(STATUS "${PACKAGE} definitions: ${${PACKAGE}_DEFINITIONS}") + endif() endif() endforeach() @@ -434,8 +443,15 @@ endif() if(HAVE_LIBZLIB) set(HAVE_LIBZ 1) endif() -# QT_LIBRARIES and QT_INCLUDES are not set above. They require extra magic: -if(QT_FOUND) +if (Qt5Widgets_FOUND) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") + if (Qt5_POSITION_INDEPENDENT_CODE) + set(CMAKE_POSITION_INDEPENDENT_CODE ON) + endif() + set (QT_FOUND ON) + set (QT_LIBRARIES ${Qt5Widgets_LIBRARIES} ${Qt5PrintSupport_LIBRARIES}) +# If Qt4: QT_LIBRARIES and QT_INCLUDES are not set above. They require extra magic +elseif(QT_FOUND) include(${QT_USE_FILE}) include_directories(${QT_INCLUDE_DIR}) message(STATUS "QT includes: ${QT_INCLUDE_DIR}") |