projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed the windows build method.
[quassel.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
8fa82df
..
77c3b41
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-26,8
+26,9
@@
ENDIF(NOT BUILD_MONO AND NOT BUILD_CORE AND NOT BUILD_GUI)
# Define files
SET(quassel_mono_SRCS main/main_mono.cpp)
SET(quassel_core_SRCS main/main_core.cpp)
# Define files
SET(quassel_mono_SRCS main/main_mono.cpp)
SET(quassel_core_SRCS main/main_core.cpp)
+#SET(quassel_gui_SRCS main/main_gui.cpp ${common_SRCS})
SET(quassel_RCCS images/icons.qrc)
SET(quassel_RCCS images/icons.qrc)
-SET(quassel_DIRS
gui core
)
+SET(quassel_DIRS
main gui core network
)
# Build correct absolute paths for subdirs to include
SET(SDIRS "")
# Build correct absolute paths for subdirs to include
SET(SDIRS "")
@@
-41,15
+42,19
@@
FIND_PACKAGE(Qt4 REQUIRED)
# Set needed libraries
SET(QT_USE_QTXML true)
# Set needed libraries
SET(QT_USE_QTXML true)
+SET(QT_USE_QTNETWORK true)
SET(QT_DONT_USE_QTGUI true) # This is added later if GUI is requested
INCLUDE(${QT_USE_FILE})
SET(QT_DONT_USE_QTGUI true) # This is added later if GUI is requested
INCLUDE(${QT_USE_FILE})
-ADD_SUBDIRECTORY(
core
)
+ADD_SUBDIRECTORY(
main
)
QT4_ADD_RESOURCES(_RCCS ${quassel_RCCS})
IF(BUILD_CORE)
QT4_ADD_RESOURCES(_RCCS ${quassel_RCCS})
IF(BUILD_CORE)
+ ADD_DEFINITIONS(-DBUILD_CORE)
+ ADD_SUBDIRECTORY(network)
+ ADD_SUBDIRECTORY(core)
ADD_EXECUTABLE(quasselcore ${quassel_core_SRCS} ${_RCCS})
ADD_EXECUTABLE(quasselcore ${quassel_core_SRCS} ${_RCCS})
- TARGET_LINK_LIBRARIES(quasselcore core ${QT_LIBRARIES})
+ TARGET_LINK_LIBRARIES(quasselcore core
network main
${QT_LIBRARIES})
ENDIF(BUILD_CORE)
IF(BUILD_GUI OR BUILD_MONO) # OK, now we need QtGui!
ENDIF(BUILD_CORE)
IF(BUILD_GUI OR BUILD_MONO) # OK, now we need QtGui!
@@
-60,14
+65,19
@@
IF(BUILD_GUI OR BUILD_MONO) # OK, now we need QtGui!
INCLUDE(${QT_USE_FILE})
IF(BUILD_MONO)
INCLUDE(${QT_USE_FILE})
IF(BUILD_MONO)
+ ADD_DEFINITIONS(-DBUILD_MONO)
ADD_SUBDIRECTORY(gui)
ADD_SUBDIRECTORY(gui)
+ ADD_SUBDIRECTORY(network)
+ ADD_SUBDIRECTORY(core)
ADD_EXECUTABLE(quassel ${quassel_mono_SRCS} ${_RCCS})
ADD_EXECUTABLE(quassel ${quassel_mono_SRCS} ${_RCCS})
- TARGET_LINK_LIBRARIES(quassel gui core ${QT_LIBRARIES})
+ TARGET_LINK_LIBRARIES(quassel gui core
network main
${QT_LIBRARIES})
ENDIF(BUILD_MONO)
IF(BUILD_GUI)
ENDIF(BUILD_MONO)
IF(BUILD_GUI)
+ ADD_DEFINITIONS(-DBUILD_GUI)
ADD_SUBDIRECTORY(gui)
ADD_SUBDIRECTORY(gui)
- MESSAGE(FATAL_ERROR "Client mode not yet supported.")
+ ADD_EXECUTABLE(quasselgui ${quassel_gui_SRCS} ${_RCCS})
+ TARGET_LINK_LIBRARIES(quasselgui gui main ${QT_LIBRARIES})
ENDIF(BUILD_GUI)
ENDIF(BUILD_GUI OR BUILD_MONO)
ENDIF(BUILD_GUI)
ENDIF(BUILD_GUI OR BUILD_MONO)