projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document schema changes, tidy up upgrade script
[quassel.git]
/
src
/
core
/
CMakeLists.txt
diff --git
a/src/core/CMakeLists.txt
b/src/core/CMakeLists.txt
index
deca428
..
43e6840
100644
(file)
--- a/
src/core/CMakeLists.txt
+++ b/
src/core/CMakeLists.txt
@@
-54,17
+54,19
@@
if (QCA2_FOUND)
list(APPEND LIBS ${QCA2_LIBRARIES})
endif()
list(APPEND LIBS ${QCA2_LIBRARIES})
endif()
-include_directories(${CMAKE_SOURCE_DIR}/src/common)
+if (QCA2-QT5_FOUND)
+ add_definitions(-DHAVE_QCA2)
+ include_directories(${QCA2-QT5_INCLUDE_DIR})
+ list(APPEND SOURCES cipher.cpp)
+ list(APPEND LIBS ${QCA2-QT5_LIBRARIES})
+endif()
-
set(CORE_RCS ${CORE_RCS} core/sql.qrc PARENT_SCOPE
)
+
include_directories(${CMAKE_SOURCE_DIR}/src/common
)
+set(CORE_RCS ${CORE_RCS} ${CMAKE_CURRENT_SOURCE_DIR}/sql.qrc)
qt_add_resources(SOURCES ${CORE_RCS})
add_library(mod_core STATIC ${SOURCES})
qt_use_modules(mod_core Core Network Script Sql)
qt_add_resources(SOURCES ${CORE_RCS})
add_library(mod_core STATIC ${SOURCES})
qt_use_modules(mod_core Core Network Script Sql)
-add_dependencies(mod_core mod_common)
-
-if (LIBS)
- target_link_libraries(mod_core ${LIBS})
-endif()
+target_link_libraries(mod_core mod_common ${LIBS})