projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: Remove build system support for Qt4/KDE4
[quassel.git]
/
src
/
common
/
CMakeLists.txt
diff --git
a/src/common/CMakeLists.txt
b/src/common/CMakeLists.txt
index
32b5370
..
661d10c
100644
(file)
--- a/
src/common/CMakeLists.txt
+++ b/
src/common/CMakeLists.txt
@@
-37,6
+37,7
@@
set(SOURCES
peer.cpp
peerfactory.cpp
presetnetworks.cpp
peer.cpp
peerfactory.cpp
presetnetworks.cpp
+ qt5cliparser.cpp
quassel.cpp
remotepeer.cpp
settings.cpp
quassel.cpp
remotepeer.cpp
settings.cpp
@@
-58,13
+59,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()
@@
-75,10
+70,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()
@@
-97,10
+88,10
@@
else()
set(SOURCES ${SOURCES} logbacktrace_unix.cpp posixsignalwatcher.cpp)
endif()
set(SOURCES ${SOURCES} logbacktrace_unix.cpp posixsignalwatcher.cpp)
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")