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 Qt5 in the build system
[quassel.git]
/
src
/
core
/
CMakeLists.txt
diff --git
a/src/core/CMakeLists.txt
b/src/core/CMakeLists.txt
index
b669424
..
5c6f0b6
100644
(file)
--- a/
src/core/CMakeLists.txt
+++ b/
src/core/CMakeLists.txt
@@
-1,10
+1,6
@@
# Builds the core module
# Builds the core module
-set(QT_DONT_USE_QTGUI 1)
-set(QT_USE_QTNETWORK 1)
-set(QT_USE_QTSQL 1)
-set(QT_USE_QTSCRIPT 1)
-include(${QT_USE_FILE})
+setup_qt_variables(Network Sql Script)
set(SOURCES
abstractsqlstorage.cpp
set(SOURCES
abstractsqlstorage.cpp
@@
-86,13
+82,17
@@
if(HAVE_QCA2)
include_directories(${QCA2_INCLUDE_DIR})
endif(HAVE_QCA2)
include_directories(${QCA2_INCLUDE_DIR})
endif(HAVE_QCA2)
-qt4_wrap_cpp(MOC ${MOC_HDRS})
-set(CORE_RCS ${CORE_RCS} core/sql.qrc PARENT_SCOPE)
+include_directories(${CMAKE_SOURCE_DIR}/src/common ${QUASSEL_QT_INCLUDES})
+
+if(NOT WITH_QT5)
+ qt4_wrap_cpp(MOC ${MOC_HDRS})
+endif(NOT WITH_QT5)
-
include_directories(${CMAKE_SOURCE_DIR}/src/common
)
+
set(CORE_RCS ${CORE_RCS} core/sql.qrc PARENT_SCOPE
)
add_library(mod_core STATIC ${SOURCES} ${MOC} ${HEADERS})
add_dependencies(mod_core mod_common)
add_library(mod_core STATIC ${SOURCES} ${MOC} ${HEADERS})
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})