projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix support for CMake < 3
[quassel.git]
/
src
/
CMakeLists.txt
diff --git
a/src/CMakeLists.txt
b/src/CMakeLists.txt
index
9732c32
..
59facd8
100644
(file)
--- a/
src/CMakeLists.txt
+++ b/
src/CMakeLists.txt
@@
-1,60
+1,74
@@
# Builds the three main targets
add_subdirectory(common)
# Builds the three main targets
add_subdirectory(common)
-include_directories(common)
-if(
WANT_CORE OR WANT_MONO
)
+include_directories(
BEFORE
common)
+if(
BUILD_CORE
)
add_subdirectory(core)
add_subdirectory(core)
- include_directories(core)
-endif(
WANT_CORE OR WANT_MONO
)
-if(
WANT_QTCLIENT OR WANT_MONO
)
+ include_directories(
BEFORE
core)
+endif(
BUILD_CORE
)
+if(
BUILD_GUI
)
add_subdirectory(client)
add_subdirectory(uisupport)
add_subdirectory(qtui)
add_subdirectory(client)
add_subdirectory(uisupport)
add_subdirectory(qtui)
- include_directories(client)
- include_directories(uisupport)
- include_directories(qtui)
-endif(WANT_QTCLIENT OR WANT_MONO)
+ include_directories(BEFORE client)
+ include_directories(BEFORE uisupport)
+ include_directories(BEFORE qtui)
-# We always add stuff in :/pics
-qt4_add_resources(RC_ICONS ../pics/pics.qrc)
+ if(STATIC)
+ link_directories(${QT_PLUGINS_DIR}/imageformats)
+ set(CLIENT_LIBRARIES ${CLIENT_LIBRARIES} qjpeg qgif)
+ endif(STATIC)
+endif(BUILD_GUI)
-if(QUASSEL_ICONS MATCHES "Builtin")
- qt4_add_resources(RC_ICONS ../icons/hicolor.qrc)
-endif(QUASSEL_ICONS MATCHES "Builtin")
+include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) # for version.gen
-if(OXYGEN_ICONS MATCHES "Builtin")
- qt4_add_resources(RC_ICONS ../icons/oxygen.qrc)
-endif(OXYGEN_ICONS MATCHES "Builtin")
+# We need to initialize the appropriate resources, so let's give our main.cpp some hints
+if (EMBED_DATA)
+ add_definitions(-DEMBED_DATA)
+endif()
+if (WITH_OXYGEN)
+ add_definitions(-DWITH_OXYGEN)
+endif()
-set(CLIENT_DEPS ${CLIENT_DEPS} ${RC_ICONS})
+# Needed for showing the cli option if appropriate
+if (HAVE_SYSLOG)
+ add_definitions(-DHAVE_SYSLOG)
+endif()
if(WANT_CORE)
if(WANT_CORE)
- setup_qt4_variables(NETWORK SCRIPT SQL)
- add_executable(quasselcore common/main.cpp ${COMMON_DEPS} ${CORE_DEPS})
+ add_executable(quasselcore common/main.cpp ${CORE_DEPS} ${COMMON_DEPS})
+ qt_use_modules(quasselcore Core Network ${CORE_QT_MODULES})
+ add_dependencies(quasselcore po)
set_target_properties(quasselcore PROPERTIES
set_target_properties(quasselcore PROPERTIES
- COMPILE_FLAGS "-D
QT_NETWORK_LIB -DQT_SCRIPT_LIB -DQT_SQL_LIB -DBUILD_CORE")
- target_link_libraries(quasselcore mod_core mod_common
-
${QUASSEL_QT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES
})
+ COMPILE_FLAGS "-D
BUILD_CORE"
+ OUTPUT_NAME ../quasselcore)
+
target_link_libraries(quasselcore mod_core mod_common ${COMMON_LIBRARIES} ${QUASSEL_SSL_LIBRARIES} ${QT_QTMAIN_LIBRARY
})
install(TARGETS quasselcore RUNTIME DESTINATION ${BIN_INSTALL_DIR})
endif(WANT_CORE)
install(TARGETS quasselcore RUNTIME DESTINATION ${BIN_INSTALL_DIR})
endif(WANT_CORE)
+if (KDE4_FOUND)
+ include_directories(${KDE4_INCLUDES})
+endif()
+
if(WANT_QTCLIENT)
if(WANT_QTCLIENT)
- setup_qt4_variables(${LINK_DBUS} GUI NETWORK)
- add_executable(quasselclient WIN32 common/main.cpp ${COMMON_DEPS} ${CLIENT_DEPS})
+ add_executable(quasselclient WIN32 common/main.cpp ${CLIENT_DEPS} ${COMMON_DEPS})
+ qt_use_modules(quasselclient Core Gui Network ${CLIENT_QT_MODULES})
+ add_dependencies(quasselclient po)
set_target_properties(quasselclient PROPERTIES
set_target_properties(quasselclient PROPERTIES
- COMPILE_FLAGS "-D
QT_GUI_LIB -DQT_NETWORK_LIB -DBUILD_QTUI")
- target_link_libraries(quasselclient mod_qtui mod_uisupport mod_client mod_common
-
${QUASSEL_QT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES
})
+ COMPILE_FLAGS "-D
BUILD_QTUI"
+ OUTPUT_NAME ../quasselclient)
+
target_link_libraries(quasselclient mod_qtui mod_uisupport mod_client mod_common ${COMMON_LIBRARIES} ${CLIENT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES} ${QT_QTMAIN_LIBRARY
})
install(TARGETS quasselclient RUNTIME DESTINATION ${BIN_INSTALL_DIR})
endif(WANT_QTCLIENT)
if(WANT_MONO)
install(TARGETS quasselclient RUNTIME DESTINATION ${BIN_INSTALL_DIR})
endif(WANT_QTCLIENT)
if(WANT_MONO)
- setup_qt4_variables(${LINK_DBUS} GUI NETWORK SCRIPT SQL)
- add_executable(quassel WIN32 common/main.cpp qtui/monoapplication.cpp ${COMMON_DEPS} ${CLIENT_DEPS} ${CORE_DEPS})
+ add_executable(quassel WIN32 common/main.cpp qtui/monoapplication.cpp ${CLIENT_DEPS} ${CORE_DEPS} ${COMMON_DEPS})
+ qt_use_modules(quassel Core Gui Network ${CLIENT_QT_MODULES} ${CORE_QT_MODULES})
+ add_dependencies(quassel po)
set_target_properties(quassel PROPERTIES
set_target_properties(quassel PROPERTIES
- COMPILE_FLAGS "-D
QT_GUI_LIB -DQT_NETWORK_LIB -DQT_SCRIPT_LIB -DQT_SQL_LIB -DBUILD_MONO")
- target_link_libraries(quassel mod_qtui mod_uisupport mod_client mod_core mod_common
-
${QUASSEL_QT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES
})
+ COMPILE_FLAGS "-D
BUILD_MONO"
+ OUTPUT_NAME ../quassel)
+
target_link_libraries(quassel mod_qtui mod_uisupport mod_client mod_core mod_common ${COMMON_LIBRARIES} ${CLIENT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES} ${QT_QTMAIN_LIBRARY
})
install(TARGETS quassel RUNTIME DESTINATION ${BIN_INSTALL_DIR})
endif(WANT_MONO)
install(TARGETS quassel RUNTIME DESTINATION ${BIN_INSTALL_DIR})
endif(WANT_MONO)
@@
-62,14
+76,16
@@
endif(WANT_MONO)
if(APPLE)
add_custom_command(TARGET quasselclient POST_BUILD
COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makebundle.py
if(APPLE)
add_custom_command(TARGET quasselclient POST_BUILD
COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makebundle.py
- ${CMAKE_SOURCE_DIR} "Quassel Client" quasselclient)
+ ${CMAKE_SOURCE_DIR} "Quassel Client"
../
quasselclient)
add_custom_command(TARGET quassel POST_BUILD
COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makebundle.py
add_custom_command(TARGET quassel POST_BUILD
COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makebundle.py
- ${CMAKE_SOURCE_DIR} "Quassel" quassel)
+ ${CMAKE_SOURCE_DIR} "Quassel"
../
quassel)
if(DEPLOY)
add_custom_command(TARGET quasselclient POST_BUILD
if(DEPLOY)
add_custom_command(TARGET quasselclient POST_BUILD
- COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Client)
+ COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Client ..)
+ add_custom_command(TARGET quasselcore POST_BUILD
+ COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Core ..)
add_custom_command(TARGET quasselcore POST_BUILD
add_custom_command(TARGET quasselcore POST_BUILD
- COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh
Core
)
+ COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh
Mono ..
)
endif(DEPLOY)
endif(APPLE)
endif(DEPLOY)
endif(APPLE)