projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: Remove build system support for Qt4/KDE4
[quassel.git]
/
src
/
CMakeLists.txt
diff --git
a/src/CMakeLists.txt
b/src/CMakeLists.txt
index
4d431e4
..
8beb17c
100644
(file)
--- a/
src/CMakeLists.txt
+++ b/
src/CMakeLists.txt
@@
-5,7
+5,7
@@
include_directories(BEFORE common)
if(BUILD_CORE)
add_subdirectory(core)
include_directories(BEFORE core)
if(BUILD_CORE)
add_subdirectory(core)
include_directories(BEFORE core)
-endif(
BUILD_CORE
)
+endif()
if(BUILD_GUI)
add_subdirectory(client)
add_subdirectory(uisupport)
if(BUILD_GUI)
add_subdirectory(client)
add_subdirectory(uisupport)
@@
-17,8
+17,8
@@
if(BUILD_GUI)
if(STATIC)
link_directories(${QT_PLUGINS_DIR}/imageformats)
set(CLIENT_LIBRARIES ${CLIENT_LIBRARIES} qjpeg qgif)
if(STATIC)
link_directories(${QT_PLUGINS_DIR}/imageformats)
set(CLIENT_LIBRARIES ${CLIENT_LIBRARIES} qjpeg qgif)
- endif(
STATIC
)
-endif(
BUILD_GUI
)
+ endif()
+endif()
include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) # for version.gen
include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) # for version.gen
@@
-26,46
+26,49
@@
include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) # for version.gen
if (EMBED_DATA)
add_definitions(-DEMBED_DATA)
endif()
if (EMBED_DATA)
add_definitions(-DEMBED_DATA)
endif()
-if (WITH_OXYGEN)
- add_definitions(-DWITH_OXYGEN)
+
+# For KAboutData
+if (WITH_KF5)
+ set(CLIENT_LIBRARIES ${CLIENT_LIBRARIES} KF5::CoreAddons)
+endif()
+
+# Needed for showing the cli option if appropriate
+if (HAVE_SYSLOG)
+ add_definitions(-DHAVE_SYSLOG)
endif()
if(WANT_CORE)
endif()
if(WANT_CORE)
- add_executable(quasselcore common/main.cpp)
- qt_use_modules(quasselcore Core Network ${CORE_QT_MODULES})
+ add_executable(quasselcore common/main.cpp
${CORE_DEPS} ${COMMON_DEPS}
)
+ qt
5
_use_modules(quasselcore Core Network ${CORE_QT_MODULES})
add_dependencies(quasselcore po)
set_target_properties(quasselcore PROPERTIES
COMPILE_FLAGS "-DBUILD_CORE"
add_dependencies(quasselcore po)
set_target_properties(quasselcore PROPERTIES
COMPILE_FLAGS "-DBUILD_CORE"
-
OUTPUT_NAME ../quasselcore
)
+
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
)
target_link_libraries(quasselcore mod_core mod_common ${COMMON_LIBRARIES} ${QUASSEL_SSL_LIBRARIES} ${QT_QTMAIN_LIBRARY})
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)
-
-if (KDE4_FOUND)
- include_directories(${KDE4_INCLUDES})
+ install(TARGETS quasselcore RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
if(WANT_QTCLIENT)
endif()
if(WANT_QTCLIENT)
- add_executable(quasselclient WIN32 common/main.cpp)
- qt_use_modules(quasselclient Core Gui Network ${CLIENT_QT_MODULES})
+ add_executable(quasselclient WIN32 common/main.cpp
${CLIENT_DEPS} ${COMMON_DEPS}
)
+ qt
5
_use_modules(quasselclient Core Gui Network ${CLIENT_QT_MODULES})
add_dependencies(quasselclient po)
set_target_properties(quasselclient PROPERTIES
COMPILE_FLAGS "-DBUILD_QTUI"
add_dependencies(quasselclient po)
set_target_properties(quasselclient PROPERTIES
COMPILE_FLAGS "-DBUILD_QTUI"
-
OUTPUT_NAME ../quasselclient
)
+
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
)
target_link_libraries(quasselclient mod_qtui mod_uisupport mod_client mod_common ${COMMON_LIBRARIES} ${CLIENT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES} ${QT_QTMAIN_LIBRARY})
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
)
+ install(TARGETS quasselclient RUNTIME DESTINATION ${
CMAKE_INSTALL_BIN
DIR})
+endif()
if(WANT_MONO)
if(WANT_MONO)
- add_executable(quassel WIN32 common/main.cpp qtui/monoapplication.cpp)
- qt_use_modules(quassel Core Gui Network ${CLIENT_QT_MODULES} ${CORE_QT_MODULES})
+ add_executable(quassel WIN32 common/main.cpp qtui/monoapplication.cpp
${CLIENT_DEPS} ${CORE_DEPS} ${COMMON_DEPS}
)
+ qt
5
_use_modules(quassel Core Gui Network ${CLIENT_QT_MODULES} ${CORE_QT_MODULES})
add_dependencies(quassel po)
set_target_properties(quassel PROPERTIES
COMPILE_FLAGS "-DBUILD_MONO"
add_dependencies(quassel po)
set_target_properties(quassel PROPERTIES
COMPILE_FLAGS "-DBUILD_MONO"
-
OUTPUT_NAME ../quassel
)
+
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
)
target_link_libraries(quassel mod_qtui mod_uisupport mod_client mod_core mod_common ${COMMON_LIBRARIES} ${CLIENT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES} ${QT_QTMAIN_LIBRARY})
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 ${
CMAKE_INSTALL_BIN
DIR})
+endif()
# Build bundles for MacOSX
if(APPLE)
# Build bundles for MacOSX
if(APPLE)
@@
-77,8
+80,10
@@
if(APPLE)
${CMAKE_SOURCE_DIR} "Quassel" ../quassel)
if(DEPLOY)
add_custom_command(TARGET quasselclient POST_BUILD
${CMAKE_SOURCE_DIR} "Quassel" ../quassel)
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 ..
qsvgicon
)
add_custom_command(TARGET quasselcore POST_BUILD
COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Core ..)
add_custom_command(TARGET quasselcore POST_BUILD
COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Core ..)
- endif(DEPLOY)
-endif(APPLE)
+ add_custom_command(TARGET quassel POST_BUILD
+ COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Mono .. qsvgicon)
+ endif()
+endif()