From 03f4ea053b4b00c8c1b31560d7d48361b88b1a2d Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 15 Nov 2017 16:00:18 +0100
Subject: cmake 2.8.12 compat

---
 CMakeLists.txt | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23da4de..7e7d4cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,8 +23,6 @@ FIND_PACKAGE(VNC REQUIRED)
 
 SET(CMAKE_AUTOMOC ON)
 SET(CMAKE_AUTORCC ON)
-SET(CMAKE_AUTOUIC ON)
-SET(CMAKE_AUTOUIC_SEARCH_PATHS gui/server_normal gui/client)
 
 # some includes
 INCLUDE_DIRECTORIES(
@@ -78,13 +76,13 @@ FILE(GLOB PVSCLIENT_SRCS
 ################################################################################
 
 # .ui files
-#FILE(GLOB PVSMGR_UIS
-#	gui/server_normal/*.ui
-#)
+FILE(GLOB PVSMGR_UIS
+	gui/server_normal/*.ui
+)
 
-#FILE(GLOB PVSCLIENT_UIS
-#	gui/client/*.ui
-#)
+FILE(GLOB PVSCLIENT_UIS
+	gui/client/*.ui
+)
 
 # .qrc files
 SET(PVSMGR_RCS pvsmgr.qrc)
@@ -127,8 +125,8 @@ FILE(GLOB PVSCLIENT_TSS
 #QT4_ADD_RESOURCES(PVSCLIENT_RC_SRCS ${PVSCLIENT_RCS})
 
 # this will run uic on .ui files
-#QT4_WRAP_UI(PVSMGR_UI_HDRS ${PVSMGR_UIS})
-#QT4_WRAP_UI(PVSCLIENT_UI_HDRS ${PVSCLIENT_UIS})
+QT5_WRAP_UI(PVSMGR_UI_HDRS ${PVSMGR_UIS})
+QT5_WRAP_UI(PVSCLIENT_UI_HDRS ${PVSCLIENT_UIS})
 
 # this will run moc
 #QT4_WRAP_CPP(PVSMGR_MOC_SRCS ${PVSMGR_MOC_HDRS})
@@ -160,7 +158,7 @@ ADD_EXECUTABLE(pvsmgr
     ${PVSMGR_SRCS}
     ${PVSMGR_RCS}
 #    ${PVSMGR_MOC_SRCS}
-#    ${PVSMGR_UI_HDRS}
+    ${PVSMGR_UI_HDRS}
 #    ${PVSMGR_RC_SRCS}
 #    ${PVSMGR_QMS}
 )
@@ -169,7 +167,7 @@ ADD_EXECUTABLE(pvsclient
     ${PVSCLIENT_SRCS}
     ${PVSCLIENT_RCS}
 #    ${PVSCLIENT_MOC_SRCS}
-#    ${PVSCLIENT_UI_HDRS}
+    ${PVSCLIENT_UI_HDRS}
 #    ${PVSCLIENT_RC_SRCS}
 #    ${PVSCLIENT_QMS}
 )
-- 
cgit v1.2.3-55-g7522