projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Rework command line option handling
[quassel.git]
/
src
/
common
/
CMakeLists.txt
diff --git
a/src/common/CMakeLists.txt
b/src/common/CMakeLists.txt
index
d9bc71a
..
1c0fd26
100644
(file)
--- a/
src/common/CMakeLists.txt
+++ b/
src/common/CMakeLists.txt
@@
-1,6
+1,7
@@
# Builds the common module
set(SOURCES
# Builds the common module
set(SOURCES
+ abstractsignalwatcher.h
aliasmanager.cpp
authhandler.cpp
backlogmanager.cpp
aliasmanager.cpp
authhandler.cpp
backlogmanager.cpp
@@
-40,6
+41,7
@@
set(SOURCES
remotepeer.cpp
settings.cpp
signalproxy.cpp
remotepeer.cpp
settings.cpp
signalproxy.cpp
+ singleton.h
syncableobject.cpp
transfer.cpp
transfermanager.cpp
syncableobject.cpp
transfer.cpp
transfermanager.cpp
@@
-56,13
+58,7
@@
set(SOURCES
protocol.h
)
protocol.h
)
-if (USE_QT5)
- list(APPEND SOURCES qt5cliparser.cpp)
-else()
- list(APPEND SOURCES cliparser.cpp)
-endif()
-
-if (QCA2_FOUND OR QCA2-QT5_FOUND)
+if (QCA2-QT5_FOUND)
set(SOURCES ${SOURCES} keyevent.cpp)
endif()
set(SOURCES ${SOURCES} keyevent.cpp)
endif()
@@
-73,10
+69,6
@@
else()
set(SOURCES ${SOURCES} ../../3rdparty/miniz/miniz.c)
endif()
set(SOURCES ${SOURCES} ../../3rdparty/miniz/miniz.c)
endif()
-if (USE_QT4)
- set(SOURCES ${SOURCES} ../../3rdparty/sha512/sha512.c)
-endif()
-
if (HAVE_SYSLOG)
add_definitions(-DHAVE_SYSLOG)
endif()
if (HAVE_SYSLOG)
add_definitions(-DHAVE_SYSLOG)
endif()
@@
-86,19
+78,19
@@
if (APPLE)
endif()
if (WIN32)
endif()
if (WIN32)
- set(SOURCES ${SOURCES} logbacktrace_win.cpp)
+ set(SOURCES ${SOURCES} logbacktrace_win.cpp
windowssignalwatcher.cpp
)
else()
if (EXECINFO_FOUND)
add_definitions(-DHAVE_EXECINFO)
include_directories(${EXECINFO_INCLUDES})
endif()
else()
if (EXECINFO_FOUND)
add_definitions(-DHAVE_EXECINFO)
include_directories(${EXECINFO_INCLUDES})
endif()
- set(SOURCES ${SOURCES} logbacktrace_unix.cpp)
+ set(SOURCES ${SOURCES} logbacktrace_unix.cpp
posixsignalwatcher.cpp
)
endif()
endif()
-qt_add_resources(SOURCES ${COMMON_RCS})
+qt
5
_add_resources(SOURCES ${COMMON_RCS})
add_library(mod_common STATIC ${SOURCES})
add_library(mod_common STATIC ${SOURCES})
-qt_use_modules(mod_common Core Network)
+qt
5
_use_modules(mod_common Core Network)
if (APPLE)
target_link_libraries(mod_common "-framework CoreServices" "-framework CoreFoundation")
if (APPLE)
target_link_libraries(mod_common "-framework CoreServices" "-framework CoreFoundation")