projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing a mismatch in the automatic sig/slot connector auf the sigproxy
[quassel.git]
/
src
/
common
/
CMakeLists.txt
diff --git
a/src/common/CMakeLists.txt
b/src/common/CMakeLists.txt
index
1c890fc
..
fb4c3e8
100644
(file)
--- a/
src/common/CMakeLists.txt
+++ b/
src/common/CMakeLists.txt
@@
-11,18
+11,27
@@
set(SOURCES
buffersyncer.cpp
bufferviewconfig.cpp
bufferviewmanager.cpp
buffersyncer.cpp
bufferviewconfig.cpp
bufferviewmanager.cpp
-
global
.cpp
+
cliparser
.cpp
identity.cpp
identity.cpp
+ ircchannel.cpp
+ ircuser.cpp
logger.cpp
message.cpp
logger.cpp
message.cpp
+ network.cpp
+ quassel.cpp
settings.cpp
signalproxy.cpp
syncableobject.cpp
settings.cpp
signalproxy.cpp
syncableobject.cpp
- util.cpp
- network.cpp
- ircuser.cpp
- ircchannel.cpp
- cliparser.cpp)
+ util.cpp)
+
+if(CMAKE_HOST_WIN32)
+ set(SOURCES ${SOURCES} logbacktrace_win.cpp)
+endif(CMAKE_HOST_WIN32)
+if(CMAKE_HOST_UNIX)
+ set(SOURCES ${SOURCES} logbacktrace_unix.cpp)
+endif(CMAKE_HOST_UNIX)
+
+
set(MOC_HDRS
aliasmanager.h
set(MOC_HDRS
aliasmanager.h
@@
-36,23
+45,25
@@
set(MOC_HDRS
irclisthelper.h
ircuser.h
network.h
irclisthelper.h
ircuser.h
network.h
+ settings.h
signalproxy.h
syncableobject.h)
set(HEADERS ${MOC_HDRS}
bufferinfo.h
signalproxy.h
syncableobject.h)
set(HEADERS ${MOC_HDRS}
bufferinfo.h
-
global
.h
+
cliparser
.h
logger.h
message.h
logger.h
message.h
- settings.h
types.h
types.h
- util.h
- cliparser.h)
+ util.h)
qt4_wrap_cpp(MOC ${MOC_HDRS})
qt4_wrap_cpp(MOC ${MOC_HDRS})
+
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}) # for version.inc and version.gen
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
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES version.gen)
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES version.gen)
-add_library(mod_common STATIC ${SOURCES} ${MOC})
+add_library(mod_common STATIC ${SOURCES} ${MOC} ${CMAKE_BINARY_DIR}/i18n/qrc_i18n.cxx)
+set_source_files_properties(${CMAKE_BINARY_DIR}/i18n/qrc_i18n.cxx PROPERTIES GENERATED true)
+add_dependencies(mod_common i18n)
+