From 06fe4abf6a662bf892092ad45ff8d50e4592cfd5 Mon Sep 17 00:00:00 2001 From: Dushyant Basson Date: Sat, 23 Apr 2022 16:03:30 +0530 Subject: [PATCH] Updated to use Qt5 --- src/qtviewer/CMakeLists.txt | 40 ++++++++++++------------------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/src/qtviewer/CMakeLists.txt b/src/qtviewer/CMakeLists.txt index a1649011aa..3a694899c8 100644 --- a/src/qtviewer/CMakeLists.txt +++ b/src/qtviewer/CMakeLists.txt @@ -17,39 +17,25 @@ # # ################################################################################ -# Find QT header files -SET(QT_MIN_VERSION "4.5.0") -FIND_PACKAGE(Qt4 REQUIRED) -FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtOpenGL) +cmake_minimum_required(VERSION 3.1.3) -INCLUDE(${QT_USE_FILE}) -SET(CMAKE_PACKAGE_QTGUI TRUE) +message("Running CMakeLists.txt in /src/qtviewer") +message("Provide the path to Qt5 via CMAKE_PREFIX_PATH") -# Find QT header files -IF("$ENV{QT_INCLUDE_DIR}" STREQUAL "") - SET(QT_INCLUDE_DIR "/usr/include/QT4/" CACHE FILEPATH "QT4 header files") - MESSAGE(STATUS "Looking for QT4 include files in: ${QT_INCLUDE_DIR}") - MESSAGE(STATUS "Use QT_INCLUDE_DIR to specify another directory") -ELSE() - SET(QT_INCLUDE_DIR $ENV{QT_INCLUDE_DIR} CACHE FILEPATH "QT4 header files") - MESSAGE(STATUS "Looking for QT4 include files in: ${QT_INCLUDE_DIR}") -ENDIF() +find_package(Qt5 COMPONENTS Core Gui OpenGL Widgets REQUIRED) - -INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR}) - -SET(QTviewer_SRCS +add_executable(QtViewer ../../src/qtviewer/mainwindow.h ../../src/qtviewer/mainwindow.cpp ../../src/qtviewer/main.cpp ) -SET(QTviewer_MOC_SRCS - ../../src/qtviewer/mainwindow.h + +set_target_properties(QtViewer PROPERTIES + AUTOMOC On ) -QT_WRAP_CPP(QTviewer QTviewer_SRCS ${QTviewer_MOC_SRCS}) - -ADD_EXECUTABLE( QTviewer ${QTviewer_SRCS} ${QTviewer_MOC_SRCS}) -#http://www.qtcentre.org/wiki/index.php?title=Compiling_Qt4_apps_with_CMake - -TARGET_LINK_LIBRARIES (QTviewer ${IFCLIBS} ${QT_LIBRARIES} ${OPENCASCADE_LIBRARIES}) +target_link_libraries(QTviewer + ${IFCLIBS} + Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Widgets + ${OPENCASCADE_LIBRARIES} +) \ No newline at end of file