projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for compiling with QCA on Qt5
[quassel.git]
/
src
/
common
/
CMakeLists.txt
diff --git
a/src/common/CMakeLists.txt
b/src/common/CMakeLists.txt
index
101498c
..
52560a1
100644
(file)
--- a/
src/common/CMakeLists.txt
+++ b/
src/common/CMakeLists.txt
@@
-47,7
+47,7
@@
set(SOURCES
)
)
-if (QCA2_FOUND)
+if (QCA2_FOUND
OR QCA2-QT5_FOUND
)
set(SOURCES ${SOURCES} keyevent.cpp)
endif()
set(SOURCES ${SOURCES} keyevent.cpp)
endif()
@@
-76,6
+76,8
@@
else()
set(SOURCES ${SOURCES} logbacktrace_unix.cpp)
endif()
set(SOURCES ${SOURCES} logbacktrace_unix.cpp)
endif()
+qt_add_resources(SOURCES ${COMMON_RCS})
+
add_library(mod_common STATIC ${SOURCES})
qt_use_modules(mod_common Core Network)
add_library(mod_common STATIC ${SOURCES})
qt_use_modules(mod_common Core Network)
@@
-84,3
+86,7
@@
if(APPLE)
endif(APPLE)
target_link_libraries(mod_common ${CMAKE_DL_LIBS} ${EXECINFO_LIBRARIES} ${ZLIB_LIBRARIES})
endif(APPLE)
target_link_libraries(mod_common ${CMAKE_DL_LIBS} ${EXECINFO_LIBRARIES} ${ZLIB_LIBRARIES})
+
+# This is needed so translations are generated before trying to build the qrc.
+# Should probably find a nicer solution with proper dependencies between the involved files, though...
+add_dependencies(mod_common po)