projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clang-tidy: Avoid memory leak in MainWin
[quassel.git]
/
src
/
CMakeLists.txt
diff --git
a/src/CMakeLists.txt
b/src/CMakeLists.txt
index
6221930
..
ea613af
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,9
+26,6
@@
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)
-endif()
# For KAboutData
if (WITH_KF5)
# For KAboutData
if (WITH_KF5)
@@
-46,10
+43,10
@@
if(WANT_CORE)
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})
install(TARGETS quasselcore RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
target_link_libraries(quasselcore mod_core mod_common ${COMMON_LIBRARIES} ${QUASSEL_SSL_LIBRARIES} ${QT_QTMAIN_LIBRARY})
install(TARGETS quasselcore RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(
WANT_CORE
)
+endif()
if (KDE4_FOUND)
include_directories(${KDE4_INCLUDES})
if (KDE4_FOUND)
include_directories(${KDE4_INCLUDES})
@@
-61,10
+58,10
@@
if(WANT_QTCLIENT)
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})
install(TARGETS quasselclient RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
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 ${CMAKE_INSTALL_BINDIR})
-endif(
WANT_QTCLIENT
)
+endif()
if(WANT_MONO)
add_executable(quassel WIN32 common/main.cpp qtui/monoapplication.cpp ${CLIENT_DEPS} ${CORE_DEPS} ${COMMON_DEPS})
if(WANT_MONO)
add_executable(quassel WIN32 common/main.cpp qtui/monoapplication.cpp ${CLIENT_DEPS} ${CORE_DEPS} ${COMMON_DEPS})
@@
-72,10
+69,10
@@
if(WANT_MONO)
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})
install(TARGETS quassel RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
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 ${CMAKE_INSTALL_BINDIR})
-endif(
WANT_MONO
)
+endif()
# Build bundles for MacOSX
if(APPLE)
# Build bundles for MacOSX
if(APPLE)
@@
-87,10
+84,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 ..)
- add_custom_command(TARGET quassel
core
POST_BUILD
- COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Mono ..)
- endif(
DEPLOY
)
-endif(
APPLE
)
+ add_custom_command(TARGET quassel POST_BUILD
+ COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Mono ..
qsvgicon
)
+ endif()
+endif()