projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify handling of (dual-)Qt in the build system
[quassel.git]
/
src
/
core
/
CMakeLists.txt
diff --git
a/src/core/CMakeLists.txt
b/src/core/CMakeLists.txt
index
a167d8f
..
25e1488
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
@@
-52,13
+50,14
@@
if(HAVE_QCA2)
include_directories(${QCA2_INCLUDE_DIR})
endif(HAVE_QCA2)
include_directories(${QCA2_INCLUDE_DIR})
endif(HAVE_QCA2)
-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)
add_library(mod_core STATIC ${SOURCES})
set(CORE_RCS ${CORE_RCS} core/sql.qrc PARENT_SCOPE)
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_LIBRARIES})
if(HAVE_QCA2)
target_link_libraries(mod_core ${QCA2_LIBRARIES})