X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2FCMakeLists.txt;fp=src%2FCMakeLists.txt;h=cff7f94ca22f52042ebcc96f3769ba6d3c5b939a;hp=622193063801de55fabab38b0e61e796725a25cf;hb=622ae84876eaab27ab232ee72e97e090b0aa57c0;hpb=8cacd45fd61aeaa5a50ed9985577022cae00fcff diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 62219306..cff7f94c 100644 --- 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) -endif(BUILD_CORE) +endif() 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) - endif(STATIC) -endif(BUILD_GUI) + endif() +endif() include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) # for version.gen @@ -49,7 +49,7 @@ if(WANT_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 ${CMAKE_INSTALL_BINDIR}) -endif(WANT_CORE) +endif() if (KDE4_FOUND) include_directories(${KDE4_INCLUDES}) @@ -64,7 +64,7 @@ if(WANT_QTCLIENT) 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 ${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}) @@ -75,7 +75,7 @@ if(WANT_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 ${CMAKE_INSTALL_BINDIR}) -endif(WANT_MONO) +endif() # Build bundles for MacOSX if(APPLE) @@ -92,5 +92,5 @@ if(APPLE) 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 Mono ..) - endif(DEPLOY) -endif(APPLE) + endif() +endif()