projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check for IgnoreListManager's existence before using it
[quassel.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
dbafc33
..
0271a36
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-79,8
+79,10
@@
endif(WIN32)
# Define a comma-separated list here
# e.g. for pgsql, we need -DLINK_EXTRA=pq;crypt
set(LINK_EXTRA "" CACHE STRING "Semicolon-separated list of libraries to be linked")
# Define a comma-separated list here
# e.g. for pgsql, we need -DLINK_EXTRA=pq;crypt
set(LINK_EXTRA "" CACHE STRING "Semicolon-separated list of libraries to be linked")
-string(REPLACE "," ";" LINK_EXTRA ${LINK_EXTRA})
-link_libraries(${LINK_EXTRA})
+if(LINK_EXTRA)
+ string(REPLACE "," ";" LINK_EXTRA ${LINK_EXTRA})
+ link_libraries(${LINK_EXTRA})
+endif(LINK_EXTRA)
# Build Type
# We need to make sure it's not empty
# Build Type
# We need to make sure it's not empty
@@
-101,13
+103,18
@@
endif(NOT CMAKE_BUILD_TYPE)
# Enable various flags on gcc
if(CMAKE_COMPILER_IS_GNUCXX)
# Let's just hope that all gccs support these options and skip the tests...
# Enable various flags on gcc
if(CMAKE_COMPILER_IS_GNUCXX)
# Let's just hope that all gccs support these options and skip the tests...
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi -Wall -Wextra -Wnon-virtual-dtor")
+ # -fno-strict-aliasing is needed apparently for Qt < 4.6
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi -Wall -Wextra -Wnon-virtual-dtor -fno-strict-aliasing")
set(CMAKE_CXX_FLAGS_RELWITHDEBUGINFO "-O2")
set(CMAKE_CXX_FLAGS_DEBUG "-g -fno-reorder-blocks -fno-schedule-insns -fno-inline")
set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3")
endif(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS_RELWITHDEBUGINFO "-O2")
set(CMAKE_CXX_FLAGS_DEBUG "-g -fno-reorder-blocks -fno-schedule-insns -fno-inline")
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")
@@
-262,11
+269,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)