From b91ee982b8ce1e08aad128a65312501ef5dd8ecd Mon Sep 17 00:00:00 2001 From: Iru Cai Date: Sun, 3 Apr 2016 00:22:30 +0800 Subject: CMakeLists.txt cleanup - remove qt4_automoc - set VERBOSE_MAKEFILE - set FQTERM_LIBS - remove trailing spaces and empty lines --- src/ui/CMakeLists.txt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/ui/CMakeLists.txt') diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index 8fc7b0b..e47ee73 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -1,3 +1,5 @@ +set(CMAKE_AUTOMOC ON) + if(IMAGE_USE_PICFLOW) set(IMGVIEW_SRCS imageviewer.h @@ -99,10 +101,9 @@ set(fqterm_ui_UIS if(USE_QT5) qt5_wrap_ui(fqterm_ui_UIS_H - ${fqterm_ui_UIS} + ${fqterm_ui_UIS} ) -set(CMAKE_AUTOMOC ON) find_package(Qt5Core REQUIRED) find_package(Qt5Widgets REQUIRED) find_package(Qt5Network REQUIRED) @@ -114,12 +115,7 @@ qt5_create_translation(fqterm_ui_qm_file ) else(USE_QT5) qt4_wrap_ui(fqterm_ui_UIS_H - ${fqterm_ui_UIS} -) - -qt4_automoc( - ${fqterm_ui_SRCS} - ${fqterm_ui_gen_HS} + ${fqterm_ui_UIS} ) qt4_create_translation(fqterm_ui_qm_file -- cgit v1.2.3