projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #105 from merlin1991/qdatastream
[quassel.git]
/
src
/
core
/
CMakeLists.txt
diff --git
a/src/core/CMakeLists.txt
b/src/core/CMakeLists.txt
index
cd29875
..
a9ea5ee
100644
(file)
--- a/
src/core/CMakeLists.txt
+++ b/
src/core/CMakeLists.txt
@@
-12,7
+12,6
@@
set(SOURCES
corebufferviewconfig.cpp
corebufferviewmanager.cpp
corecoreinfo.cpp
corebufferviewconfig.cpp
corebufferviewmanager.cpp
corecoreinfo.cpp
- coreeventmanager.cpp
coreidentity.cpp
coreignorelistmanager.cpp
coreircchannel.cpp
coreidentity.cpp
coreignorelistmanager.cpp
coreircchannel.cpp
@@
-57,13
+56,10
@@
endif()
include_directories(${CMAKE_SOURCE_DIR}/src/common)
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})
qt_use_modules(mod_core Core Network Script Sql)
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})