projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for SHA2-512 hash on Qt4 builds
[quassel.git]
/
src
/
common
/
CMakeLists.txt
diff --git
a/src/common/CMakeLists.txt
b/src/common/CMakeLists.txt
index
52560a1
..
414bfdf
100644
(file)
--- a/
src/common/CMakeLists.txt
+++ b/
src/common/CMakeLists.txt
@@
-9,7
+9,6
@@
set(SOURCES
buffersyncer.cpp
bufferviewconfig.cpp
bufferviewmanager.cpp
buffersyncer.cpp
bufferviewconfig.cpp
bufferviewmanager.cpp
- cliparser.cpp
compressor.cpp
ctcpevent.cpp
event.cpp
compressor.cpp
ctcpevent.cpp
event.cpp
@@
-46,6
+45,11
@@
set(SOURCES
coreinfo.h
)
coreinfo.h
)
+if (USE_QT5)
+ list(APPEND SOURCES qt5cliparser.cpp)
+else()
+ list(APPEND SOURCES cliparser.cpp)
+endif()
if (QCA2_FOUND OR QCA2-QT5_FOUND)
set(SOURCES ${SOURCES} keyevent.cpp)
if (QCA2_FOUND OR QCA2-QT5_FOUND)
set(SOURCES ${SOURCES} keyevent.cpp)
@@
-58,12
+62,16
@@
else()
set(SOURCES ${SOURCES} ../../3rdparty/miniz/miniz.c)
endif()
set(SOURCES ${SOURCES} ../../3rdparty/miniz/miniz.c)
endif()
+if (USE_QT4)
+ set(SOURCES ${SOURCES} ../../3rdparty/sha512/sha512.c)
+endif()
+
if (HAVE_SYSLOG)
add_definitions(-DHAVE_SYSLOG)
endif()
if (HAVE_SYSLOG)
add_definitions(-DHAVE_SYSLOG)
endif()
-if(APPLE)
- set(SOURCES ${SOURCES} mac_utils.cpp)
+if
(APPLE)
+
set(SOURCES ${SOURCES} mac_utils.cpp)
endif(APPLE)
if (WIN32)
endif(APPLE)
if (WIN32)
@@
-81,8
+89,8
@@
qt_add_resources(SOURCES ${COMMON_RCS})
add_library(mod_common STATIC ${SOURCES})
qt_use_modules(mod_common Core Network)
add_library(mod_common STATIC ${SOURCES})
qt_use_modules(mod_common Core Network)
-if(APPLE)
- target_link_libraries(mod_common "-framework CoreServices" "-framework CoreFoundation")
+if
(APPLE)
+
target_link_libraries(mod_common "-framework CoreServices" "-framework CoreFoundation")
endif(APPLE)
target_link_libraries(mod_common ${CMAKE_DL_LIBS} ${EXECINFO_LIBRARIES} ${ZLIB_LIBRARIES})
endif(APPLE)
target_link_libraries(mod_common ${CMAKE_DL_LIBS} ${EXECINFO_LIBRARIES} ${ZLIB_LIBRARIES})