projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make SSL and syslog support non-configurable
[quassel.git]
/
src
/
common
/
CMakeLists.txt
diff --git
a/src/common/CMakeLists.txt
b/src/common/CMakeLists.txt
index
8690625
..
36218f4
100644
(file)
--- a/
src/common/CMakeLists.txt
+++ b/
src/common/CMakeLists.txt
@@
-1,7
+1,5
@@
# Builds the common module
# Builds the common module
-setup_qt_variables(Core Network)
-
set(SOURCES
aliasmanager.cpp
authhandler.cpp
set(SOURCES
aliasmanager.cpp
authhandler.cpp
@@
-48,32
+46,40
@@
set(SOURCES
)
)
-if (
HAVE_QCA2
)
+if (
QCA2_FOUND
)
set(SOURCES ${SOURCES} keyevent.cpp)
set(SOURCES ${SOURCES} keyevent.cpp)
-endif(
HAVE_QCA2
)
+endif()
-if(NOT HAVE_ZLIB)
+if (ZLIB_FOUND)
+ add_definitions(-DHAVE_ZLIB)
+ include_directories(${ZLIB_INCLUDE_DIRS})
+else()
set(SOURCES ${SOURCES} ../../3rdparty/miniz/miniz.c)
set(SOURCES ${SOURCES} ../../3rdparty/miniz/miniz.c)
-endif(NOT HAVE_ZLIB)
+endif()
+
+if (HAVE_SYSLOG)
+ add_definitions(-DHAVE_SYSLOG)
+endif()
if(APPLE)
set(SOURCES ${SOURCES} mac_utils.cpp)
endif(APPLE)
if(APPLE)
set(SOURCES ${SOURCES} mac_utils.cpp)
endif(APPLE)
-if
(CMAKE_HOST_
WIN32)
+if
(
WIN32)
set(SOURCES ${SOURCES} logbacktrace_win.cpp)
set(SOURCES ${SOURCES} logbacktrace_win.cpp)
-endif(CMAKE_HOST_WIN32)
-if(CMAKE_HOST_UNIX)
+else()
+ if (EXECINFO_FOUND)
+ add_definitions(-DHAVE_EXECINFO)
+ include_directories(${EXECINFO_INCLUDES})
+ endif()
set(SOURCES ${SOURCES} logbacktrace_unix.cpp)
set(SOURCES ${SOURCES} logbacktrace_unix.cpp)
-endif(CMAKE_HOST_UNIX)
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QUASSEL_QT_INCLUDES}) # for version.inc and version.gen
+endif()
add_library(mod_common STATIC ${SOURCES})
add_library(mod_common STATIC ${SOURCES})
-
set_target_properties(mod_common PROPERTIES COMPILE_FLAGS "${QUASSEL_QT_COMPILEFLAGS}"
)
+
qt_use_modules(mod_common Core Network
)
if(APPLE)
target_link_libraries(mod_common "-framework CoreServices" "-framework CoreFoundation")
endif(APPLE)
if(APPLE)
target_link_libraries(mod_common "-framework CoreServices" "-framework CoreFoundation")
endif(APPLE)
-target_link_libraries(mod_common ${CMAKE_DL_LIBS})
+target_link_libraries(mod_common ${CMAKE_DL_LIBS}
${EXECINFO_LIBRARIES} ${ZLIB_LIBRARIES}
)