CMakeLists.txt cleanup

- remove qt4_automoc
- set VERBOSE_MAKEFILE
- set FQTERM_LIBS
- remove trailing spaces and empty lines

8 files changed, 18 insertions, 41 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e8aedb4..607d599 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,13 +1,7 @@
 add_subdirectory(common)
-
 add_subdirectory(protocol)
-
 add_subdirectory(ui)
-
 add_subdirectory(terminal)
-
 add_subdirectory(utilities)
-
 add_subdirectory(unite)
-
 add_subdirectory(fqterm)
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 30524fe..cc4a354 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(CMAKE_AUTOMOC ON)
+
 set(fqterm_common_SRCS
   common.h
   common.cpp
@@ -24,12 +26,10 @@ set(fqterm_common_SRCS
 
 if(USE_QT5)
   set(CMAKE_INCLUDE_CURRENT_DIR ON)
-  set(CMAKE_AUTOMOC ON)
   find_package(Qt5Core REQUIRED)
   find_package(Qt5Widgets REQUIRED)
   find_package(Qt5Multimedia REQUIRED)
 else(USE_QT5)
-  qt4_automoc(${fqterm_common_SRCS})
   include_directories(
     ${QT_INCLUDE_DIR}
     ${QT_QTCORE_INCLUDE_DIR}
@@ -45,4 +45,3 @@ add_library(fqterm_common
 if(USE_QT5)
   target_link_libraries(fqterm_common Qt5::Core Qt5::Widgets Qt5::Multimedia)
 endif(USE_QT5)
-  
\ No newline at end of file
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}
diff --git a/src/protocol/CMakeLists.txt b/src/protocol/CMakeLists.txt
index 8eeeb9b..c6cf81d 100644
--- a/src/protocol/CMakeLists.txt
+++ b/src/protocol/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(CMAKE_AUTOMOC ON)
+
 set(export_SRCS
   fqterm_socket.cpp
   fqterm_socket.h
@@ -45,14 +47,9 @@ set(internal_SRCS
 )
 
 if(USE_QT5)
-  set(CMAKE_AUTOMOC ON)
   find_package(Qt5Core REQUIRED)
   find_package(Qt5Network REQUIRED)
 else(USE_QT5)
-  qt4_automoc(
-    ${export_SRCS}
-    ${internal_SRCS}
-    )
 endif(USE_QT5)
 
 include_directories(
diff --git a/src/terminal/CMakeLists.txt b/src/terminal/CMakeLists.txt
index 92b120e..5abe2c6 100644
--- a/src/terminal/CMakeLists.txt
+++ b/src/terminal/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(CMAKE_AUTOMOC ON)
+
 set(export_SRCS
   fqterm_buffer.h
   fqterm_session.h
@@ -41,14 +43,9 @@ add_dependencies(fqterm_terminal
 )
 
 if(USE_QT5)
-  set(CMAKE_AUTOMOC ON)
   find_package(Qt5Core REQUIRED)
   find_package(Qt5Network REQUIRED)
   find_package(Qt5Widgets REQUIRED)
   target_link_libraries(fqterm_terminal Qt5::Core Qt5::Widgets Qt5::Network)
 else(USE_QT5)
-  QT4_AUTOMOC(
-    ${export_SRCS}
-    ${internal_SRCS}
-    )
 endif(USE_QT5)
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
diff --git a/src/unite/CMakeLists.txt b/src/unite/CMakeLists.txt
index a8d9d96..cf17842 100644
--- a/src/unite/CMakeLists.txt
+++ b/src/unite/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(CMAKE_AUTOMOC ON)
+
 set(fqunite_SRCS
   fqterm_mini_server.h
   fqterm_mini_server.cpp
@@ -32,7 +34,6 @@ add_library(fqterm_unite
 )
 
 if(USE_QT5)
-  set(CMAKE_AUTOMOC ON)
   find_package(Qt5Core REQUIRED)
   find_package(Qt5Widgets REQUIRED)
   find_package(Qt5Network REQUIRED)
@@ -44,14 +45,9 @@ if(USE_QT5)
     Qt5::Xml
     )
 else(USE_QT5)
-  qt4_automoc(
-    ${fqunite_SRCS}
-    ${fqunite_internal_SRCS}
-    )
 endif(USE_QT5)
 
 add_dependencies(fqterm_unite
   fqterm_common
 )
 
-  
diff --git a/src/utilities/CMakeLists.txt b/src/utilities/CMakeLists.txt
index e74a0d9..8470516 100644
--- a/src/utilities/CMakeLists.txt
+++ b/src/utilities/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(CMAKE_AUTOMOC ON)
+
 set(fqterm_utilities_SRCS
   fqterm_convert.h
   fqterm_http.h
@@ -27,11 +29,9 @@ add_dependencies(fqterm_utilities
 )
 
 if(USE_QT5)
-  set(CMAKE_AUTOMOC ON)
   find_package(Qt5Core REQUIRED)
   find_package(Qt5Widgets REQUIRED)
   find_package(Qt5Network REQUIRED)
   target_link_libraries(fqterm_utilities Qt5::Core Qt5::Widgets Qt5::Network)
 else(USE_QT5)
-  qt4_automoc(${fqterm_utilities_SRCS})
 endif(USE_QT5)