HEADERS -> MOC_HDRS and adding non-moccable files to HEADERS

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 7503f98..39436cb 100644 (file)
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -18,7 +18,7 @@ set(SOURCES
     selectionmodelsynchronizer.cpp
     treemodel.cpp)
 
-set(HEADERS
+set(MOC_HDRS
     buffer.h
     buffermodel.h
     client.h
@@ -30,10 +30,19 @@ set(HEADERS
     selectionmodelsynchronizer.h
     treemodel.h)
 
-qt4_wrap_cpp(MOC ${HEADERS})
+set(HEADERS
+    buffersettings.h
+    clientsettings.h)
+
+if(SPUTDEV)
+  set(SOURCES ${SOURCES} messagefilter.cpp messagemodel.cpp)
+  set(MOC_HDRS ${MOC_HDRS} messagefilter.h messagemodel.h)
+endif(SPUTDEV)
+
+qt4_wrap_cpp(MOC ${MOC_HDRS})
 
 include_directories(${CMAKE_SOURCE_DIR}/src/common)
 
-add_library(mod_client STATIC ${SOURCES} ${MOC})
+add_library(mod_client STATIC ${SOURCES} ${MOC} ${HEADERS})
 add_dependencies(mod_client mod_common)
 

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 58e35c0..3b1f2ab 100644 (file)
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -22,7 +22,7 @@ set(SOURCES
     ircuser.cpp
     ircchannel.cpp)
 
-set(HEADERS
+set(MOC_HDRS
     backlogmanager.h
     buffersyncer.h
     bufferviewconfig.h
@@ -35,7 +35,15 @@ set(HEADERS
     signalproxy.h
     syncableobject.h)
 
-qt4_wrap_cpp(MOC ${HEADERS})
+set(HEADERS ${MOC_HDRS}
+    bufferinfo.h
+    global.h
+    message.h
+    settings.h
+    types.h
+    util.h)
+
+qt4_wrap_cpp(MOC ${MOC_HDRS})
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})  # for version.inc and version.gen
 add_definitions(-DHAVE_VERSION_GEN)  # we ensure that by deps in the main CMakeLists.txt

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 156b84e..442e105 100644 (file)
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -24,7 +24,7 @@ set(SOURCES
     storage.cpp
     userinputhandler.cpp)
 
-set(HEADERS
+set(MOC_HDRS
     abstractsqlstorage.h
     basichandler.h
     core.h
@@ -40,6 +40,10 @@ set(HEADERS
     sessionthread.h
     userinputhandler.h)
 
+set(HEADERS
+    coresettings.h
+    coreusersettings.h)
+
 # QT_DEFINITIONS actually does not work, stuff gets included always.
 # Funny enough that does not seem to be harmful, but we should still find a way to figure out
 # if we have openssl in Qt...
@@ -47,12 +51,12 @@ find_package(OpenSSL)
 
 if(OPENSSL_FOUND AND NOT ${QT_DEFINITIONS} MATCHES "-DQT_NO_OPENSSL")
   set(SOURCES ${SOURCES} sslserver.cpp)
-  set(HEADERS ${HEADERS} sslserver.h)
+  set(MOC_HDRS ${MOC_HDRS} sslserver.h)
 endif(OPENSSL_FOUND AND NOT ${QT_DEFINITIONS} MATCHES "-DQT_NO_OPENSSL")
 
-QT4_WRAP_CPP(MOC ${HEADERS})
+QT4_WRAP_CPP(MOC ${MOC_HDRS})
 
 include_directories(${CMAKE_SOURCE_DIR}/src/common)
 
-add_library(mod_core STATIC ${SOURCES} ${MOC})
+add_library(mod_core STATIC ${SOURCES} ${MOC} ${HEADERS})
 add_dependencies(mod_core mod_common)

diff --git a/src/qtui/CMakeLists.txt b/src/qtui/CMakeLists.txt
index 3a17781..89da3d2 100644 (file)
--- a/src/qtui/CMakeLists.txt
+++ b/src/qtui/CMakeLists.txt
@@ -25,12 +25,11 @@ set(SOURCES
     topicwidget.cpp
     verticaldock.cpp)
 
-set(HEADERS
+set(MOC_HDRS
     aboutdlg.h
     bufferwidget.h
     coreconfigwizard.h
     coreconnectdlg.h
-    configwizard.h
     debugconsole.h
     inputwidget.h
     jumpkeyhandler.h
@@ -44,13 +43,18 @@ set(HEADERS
     topicwidget.h
     verticaldock.h)
 
+set(HEADERS
+    qtuisettings.h
+    qtuistyle.h)
+
 if(SPUTDEV)
   set(SOURCES ${SOURCES} chatitem.cpp chatline.cpp chatlinemodelitem.cpp
                          chatlinemodel.cpp chatscene.cpp chatview.cpp)
-  set(HEADERS ${HEADERS} chatlinemodel.h chatscene.h chatview.h)
+  set(MOC_HDRS ${MOC_HDRS} chatlinemodel.h chatscene.h chatview.h)
+  set(HEADERS ${HEADERS} chatitem.h chatline.h chatlinemodelitem.h)
 else(SPUTDEV)
   set(SOURCES ${SOURCES} chatline-old.cpp chatwidget.cpp)
-  set(HEADERS ${HEADERS} chatline-old.h chatwidget.h)
+  set(MOC_HDRS ${MOC_HDRS} chatline-old.h chatwidget.h)
 endif(SPUTDEV)
 
 set(FORMS
@@ -93,7 +97,7 @@ foreach(FRM ${SP_FORMS})
 endforeach(FRM ${SP_FORMS})
 
 
-qt4_wrap_cpp(MOC ${HEADERS} ${SPHDR})
+qt4_wrap_cpp(MOC ${MOC_HDRS} ${SPHDR})
 qt4_wrap_ui(UI ${FORMPATH} ${SPFRM})
 
 include_directories(${CMAKE_SOURCE_DIR}/src/common
@@ -102,5 +106,5 @@ include_directories(${CMAKE_SOURCE_DIR}/src/common
                     ${CMAKE_SOURCE_DIR}/src/uisupport
                     ${CMAKE_CURRENT_BINARY_DIR})
 
-add_library(mod_qtui STATIC ${SOURCES} ${SPSRC} ${MOC} ${UI})
+add_library(mod_qtui STATIC ${SOURCES} ${SPSRC} ${MOC} ${UI} ${HEADERS})
 add_dependencies(mod_qtui mod_common mod_client mod_uisupport)

diff --git a/src/uisupport/CMakeLists.txt b/src/uisupport/CMakeLists.txt
index 32664cf..ad63477 100644 (file)
--- a/src/uisupport/CMakeLists.txt
+++ b/src/uisupport/CMakeLists.txt
@@ -19,7 +19,7 @@ set(SOURCES
     uisettings.cpp
     uistylesettings.cpp)
 
-set(HEADERS
+set(MOC_HDRS
     abstractbuffercontainer.h
     abstractitemview.h
     bufferview.h
@@ -32,18 +32,22 @@ set(HEADERS
     settingspage.h
     tabcompleter.h)
 
+set(HEADERS
+    uisettings.h
+    uistylesettings.h)
+
 if(SPUTDEV)
   set(SOURCES ${SOURCES} uistyle.cpp)
-  set(HEADERS ${HEADERS} )
+  set(HEADERS ${HEADERS} uistyle.h)
 else(SPUTDEV)
   set(SOURCES ${SOURCES} old-uistyle.cpp)
-  set(HEADERS ${HEADERS} )
+  set(HEADERS ${HEADERS} old-uistyle.h)
 endif(SPUTDEV)
 
-qt4_wrap_cpp(MOC ${HEADERS})
+qt4_wrap_cpp(MOC ${MOC_HDRS})
 
 include_directories(${CMAKE_SOURCE_DIR}/src/common
                     ${CMAKE_SOURCE_DIR}/src/client)
 
-add_library(mod_uisupport STATIC ${SOURCES} ${MOC})
+add_library(mod_uisupport STATIC ${SOURCES} ${MOC} ${HEADERS})
 add_dependencies(mod_uisupport mod_common mod_client)