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/fqterm/CMakeLists.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/fqterm/CMakeLists.txt') diff --git a/src/fqterm/CMakeLists.txt b/src/fqterm/CMakeLists.txt index 6ed1d23..2c770c6 100644 --- a/src/fqterm/CMakeLists.txt +++ b/src/fqterm/CMakeLists.txt @@ -1,3 +1,5 @@ +set(CMAKE_AUTOMOC ON) + set(fqterm_SRCS fqterm_app.h fqterm_frame.h @@ -19,7 +21,7 @@ IF(IMAGE_USE_PICFLOW) ADD_DEFINITIONS(-DIMAGE_USE_PICFLOW) ELSE(IMAGE_USE_PICFLOW) ENDIF(IMAGE_USE_PICFLOW) - + IF(GLOBAL_HOTKEY EQUAL 1) IF(WIN32) set(global_shortcut_impl_SRCS 3rdparty/qxtglobalshortcut_win.cpp) @@ -54,7 +56,6 @@ set(3rdparty_SRCS ) if(USE_QT5) - set(CMAKE_AUTOMOC ON) find_package(Qt5Core REQUIRED) find_package(Qt5Widgets REQUIRED) find_package(Qt5Network REQUIRED) @@ -65,10 +66,6 @@ if(USE_QT5) ${CMAKE_SOURCE_DIR}/res/dict/fqterm_zh_CN.ts ) else(USE_QT5) - qt4_automoc(${fqterm_SRCS} - ${3rdparty_SRCS} - ) - qt4_create_translation(fqterm_qm_file ${fqterm_SRCS} ${CMAKE_SOURCE_DIR}/res/dict/fqterm_zh_CN.ts @@ -87,6 +84,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../utilities ${CMAKE_CURRENT_SOURCE_DIR}/../unite ${CMAKE_CURRENT_SOURCE_DIR}/../ui + ${CMAKE_CURRENT_SOURCE_DIR}/../ui/imageviewer ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty ${CMAKE_CURRENT_BINARY_DIR}/../ui ${CMAKE_CURRENT_BINARY_DIR} -- cgit v1.2.3