projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make backgrounds of ChatLines and ChatItems styleable
[quassel.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
6a2cf83
..
a45928a
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-109,7
+109,11
@@
if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3")
endif(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3")
endif(CMAKE_COMPILER_IS_GNUCXX)
-set(QT_MIN_VERSION "4.4.0")
+if(WANT_MONO OR WANT_QTCLIENT)
+ set(QT_MIN_VERSION "4.4.1") # Client crashes often with 4.4.0
+else(WANT_MONO OR WANT_QTCLIENT)
+ set(QT_MIN_VERSION "4.4.0")
+endif(WANT_MONO OR WANT_QTCLIENT)
if(APPLE AND DEPLOY)
set(CMAKE_OSX_ARCHITECTURES "i386;ppc")
if(APPLE AND DEPLOY)
set(CMAKE_OSX_ARCHITECTURES "i386;ppc")
@@
-264,11
+268,6
@@
if(WIN32)
endif(HAVE_SSL)
endif(WIN32)
endif(HAVE_SSL)
endif(WIN32)
-if(STATIC)
- link_directories(${QT_PLUGINS_DIR}/imageformats)
- link_libraries(qjpeg qgif)
-endif(STATIC)
-
# We need to create a version.gen
# For this, we create our genversion binary and make sure it is run every time.
add_executable(genversion ${CMAKE_SOURCE_DIR}/src/common/genversion.cpp)
# We need to create a version.gen
# For this, we create our genversion binary and make sure it is run every time.
add_executable(genversion ${CMAKE_SOURCE_DIR}/src/common/genversion.cpp)