projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump version.inc for release
[quassel.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
7fdc6fd
..
698cc49
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-191,7
+191,7
@@
if(WITH_WEBKIT)
if(QT_QTWEBKIT_FOUND)
message(STATUS "Found QtWebKit, enabling WebKit support")
add_definitions(-DHAVE_WEBKIT)
if(QT_QTWEBKIT_FOUND)
message(STATUS "Found QtWebKit, enabling WebKit support")
add_definitions(-DHAVE_WEBKIT)
- set(LINK_WEBKIT WEBKIT)
+ set(LINK_WEBKIT WEBKIT
XMLPATTERNS
)
set(HAVE_WEBKIT true)
else(QT_QTWEBKIT_FOUND)
message(STATUS "QtWebKit not found, disabling WebKit support")
set(HAVE_WEBKIT true)
else(QT_QTWEBKIT_FOUND)
message(STATUS "QtWebKit not found, disabling WebKit support")
@@
-221,7
+221,9
@@
endif(WITH_KDE)
# needed to compile with mingw without kde
if(MINGW AND NOT HAVE_KDE)
add_definitions(-D_WIN32_WINNT=0x0500)
# needed to compile with mingw without kde
if(MINGW AND NOT HAVE_KDE)
add_definitions(-D_WIN32_WINNT=0x0500)
- message(STATUS "Added _WIN32_WINNT=0x0500 definition for MinGW")
+ message(STATUS "Added _WIN32_WINNT=0x0500 definition for MinGW")
+# workaround for bug in mingw gcc 4.0
+ add_definitions(-U__STRICT_ANSI__)
endif(MINGW AND NOT HAVE_KDE)
# Setup Phonon support - we only need this if we don't have or want KDE4
endif(MINGW AND NOT HAVE_KDE)
# Setup Phonon support - we only need this if we don't have or want KDE4
@@
-300,7
+302,7
@@
if(WIN32)
endif(MSVC)
if(HAVE_SSL AND STATIC)
find_package(OpenSSL REQUIRED)
endif(MSVC)
if(HAVE_SSL AND STATIC)
find_package(OpenSSL REQUIRED)
- link_libraries(${OPENSSL_LIBRARIES})
+ link_libraries(${OPENSSL_LIBRARIES}
${OPENSSL_EAY_LIBRARIES}
)
endif(HAVE_SSL AND STATIC)
endif(WIN32)
endif(HAVE_SSL AND STATIC)
endif(WIN32)