X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2FCMakeLists.txt;h=9298b777239b6be5d66bf5b993e8eb1f5838e81f;hp=e2975583f4884edbae039428bfc0b5d1e80927b9;hb=6f0a153a674317d77233139fc50a2985af86e36e;hpb=e1801627e8e13e7eacbf0c59622a6adf20fcd4cd;ds=sidebyside diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index e2975583..9298b777 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -1,8 +1,4 @@ # Builds the common module -if (QCA2_FOUND) - include_directories(${QCA2_INCLUDE_DIR}) -endif (QCA2_FOUND) - set(QT_DONT_USE_QTGUI 1) set(QT_USE_QTNETWORK 1) include(${QT_USE_FILE}) @@ -31,18 +27,6 @@ set(SOURCES syncableobject.cpp util.cpp) -if (QCA2_FOUND) - set(SOURCES ${SOURCES} - cipher.cpp) -endif (QCA2_FOUND) - -if(CMAKE_HOST_WIN32) - set(SOURCES ${SOURCES} logbacktrace_win.cpp) -endif(CMAKE_HOST_WIN32) -if(CMAKE_HOST_UNIX) - set(SOURCES ${SOURCES} logbacktrace_unix.cpp) -endif(CMAKE_HOST_UNIX) - set(MOC_HDRS aliasmanager.h backlogmanager.h @@ -71,16 +55,18 @@ set(HEADERS ${MOC_HDRS} types.h util.h) -if (QCA2_FOUND) - set(HEADERS ${HEADERS} - cipher.h) -endif (QCA2_FOUND) - if(APPLE) set(SOURCES ${SOURCES} mac_utils.cpp) set(HEADERS ${HEADERS} mac_utils.h) endif(APPLE) +if(CMAKE_HOST_WIN32) + set(SOURCES ${SOURCES} logbacktrace_win.cpp) +endif(CMAKE_HOST_WIN32) +if(CMAKE_HOST_UNIX) + set(SOURCES ${SOURCES} logbacktrace_unix.cpp) +endif(CMAKE_HOST_UNIX) + qt4_wrap_cpp(MOC ${MOC_HDRS}) include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}) # for version.inc and version.gen @@ -92,10 +78,6 @@ if(APPLE) target_link_libraries(mod_common "-framework CoreServices" "-framework CoreFoundation") endif(APPLE) -if (QCA2_FOUND) - target_link_libraries(mod_common ${QCA2_LIBRARIES}) -endif (QCA2_FOUND) - if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") find_library(libdl dl) if(NOT libdl MATCHES "NOTFOUND")