projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes #742 - JOIN without parameters
[quassel.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
71b5518
..
251869e
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-66,6
+66,7
@@
set(LINGUAS "" CACHE STRING "Comma-separated list of locales specifying language
# Some settings imply others
if(STATIC)
# Some settings imply others
if(STATIC)
+ add_definitions(-DSTATIC)
set(WITH_KDE OFF CACHE BOOL "Static building with KDE is not supported")
endif(STATIC)
set(WITH_KDE OFF CACHE BOOL "Static building with KDE is not supported")
endif(STATIC)
@@
-77,9
+78,17
@@
endif(WIN32)
# Build Type
# We need to make sure it's not empty
# Supported: Release, RelWithDebugInfo, Debug, Debugfull
# Build Type
# We need to make sure it's not empty
# Supported: Release, RelWithDebugInfo, Debug, Debugfull
-set(CMAKE_BUILD_TYPE "RelWithDebugInfo" CACHE STRING "CMake Build Type")
+
+# On WIN32, only Release seems to work correctly (?)
+if(WIN32)
+ set(DEFAULT_BUILD_TYPE "Release")
+else(WIN32)
+ set(DEFAULT_BUILD_TYPE "RelWithDebugInfo")
+endif(WIN32)
+
+set(CMAKE_BUILD_TYPE ${DEFAULT_BUILD_TYPE} CACHE STRING "CMake Build Type")
if(NOT CMAKE_BUILD_TYPE)
if(NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE
"RelWithDebugInfo"
CACHE STRING "CMake Build Type" FORCE)
+ set(CMAKE_BUILD_TYPE
${DEFAULT_BUILD_TYPE}
CACHE STRING "CMake Build Type" FORCE)
endif(NOT CMAKE_BUILD_TYPE)
# Enable various flags on gcc
endif(NOT CMAKE_BUILD_TYPE)
# Enable various flags on gcc
@@
-91,7
+100,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")
@@
-239,15
+252,12
@@
if(STATIC AND CMAKE_COMPILER_IS_GNUCXX)
endif(STATIC AND CMAKE_COMPILER_IS_GNUCXX)
if(WIN32)
endif(STATIC AND CMAKE_COMPILER_IS_GNUCXX)
if(WIN32)
- #if(STATIC)
- link_libraries(imm32 winmm dbghelp) # missing by default :/
- #endif(STATIC)
+ link_libraries(imm32 winmm dbghelp Secur32) # missing by default :/
+
if(HAVE_SSL)
link_libraries(${OPENSSL_LIBRARIES} libeay32MD)
endif(HAVE_SSL)
if(HAVE_SSL)
link_libraries(${OPENSSL_LIBRARIES} libeay32MD)
endif(HAVE_SSL)
-endif(WIN32)
-if(WIN32)
set(RC_WIN32 ../pics/win32.rc) # for app icons on windows
endif(WIN32)
set(RC_WIN32 ../pics/win32.rc) # for app icons on windows
endif(WIN32)