projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LegacyPeer: kill the dependency to Quassel::buildInfo()
[quassel.git]
/
src
/
core
/
CMakeLists.txt
diff --git
a/src/core/CMakeLists.txt
b/src/core/CMakeLists.txt
index
a167d8f
..
6a0611a
100644
(file)
--- a/
src/core/CMakeLists.txt
+++ b/
src/core/CMakeLists.txt
@@
-1,7
+1,5
@@
# Builds the core module
# Builds the core module
-setup_qt_variables(Network Sql Script)
-
set(SOURCES
abstractsqlstorage.cpp
core.cpp
set(SOURCES
abstractsqlstorage.cpp
core.cpp
@@
-42,24
+40,30
@@
set(SOURCES
coreeventmanager.h
)
coreeventmanager.h
)
+set(LIBS )
+
if(HAVE_SSL)
set(SOURCES ${SOURCES} sslserver.cpp)
include_directories(${OPENSSL_INCLUDE_DIR})
endif(HAVE_SSL)
if(HAVE_SSL)
set(SOURCES ${SOURCES} sslserver.cpp)
include_directories(${OPENSSL_INCLUDE_DIR})
endif(HAVE_SSL)
-if(HAVE_QCA2)
- set(SOURCES ${SOURCES} cipher.cpp)
- include_directories(${QCA2_INCLUDE_DIR})
-endif(HAVE_QCA2)
+if (QCA2_FOUND)
+ add_definitions(-DHAVE_QCA2)
+ include_directories(${QCA2_INCLUDE_DIR})
+ list(APPEND SOURCES cipher.cpp)
+ list(APPEND LIBS ${QCA2_LIBRARIES})
+endif()
-include_directories(${CMAKE_SOURCE_DIR}/src/common
${QUASSEL_QT_INCLUDES}
)
+include_directories(${CMAKE_SOURCE_DIR}/src/common)
-set(CORE_RCS ${CORE_RCS} core/sql.qrc PARENT_SCOPE)
+set(CORE_RCS ${CORE_RCS} ${CMAKE_CURRENT_SOURCE_DIR}/sql.qrc)
+qt_add_resources(SOURCES ${CORE_RCS})
add_library(mod_core STATIC ${SOURCES})
add_library(mod_core STATIC ${SOURCES})
+qt_use_modules(mod_core Core Network Script Sql)
+
add_dependencies(mod_core mod_common)
add_dependencies(mod_core mod_common)
-set_target_properties(mod_core PROPERTIES COMPILE_FLAGS "${QUASSEL_QT_COMPILEFLAGS}")
-if
(HAVE_QCA2
)
-
target_link_libraries(mod_core ${QCA2_LIBRARIE
S})
-endif(
HAVE_QCA2
)
+if
(LIBS
)
+
target_link_libraries(mod_core ${LIB
S})
+endif()