X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=bbf5e57f112292ca18a6a510ee8d645f182d813b;hp=fb7041459f15cce88a95f9e66e1398d105c8b77c;hb=60587d8c119e15b61ff7830ff9f6904b8511d174;hpb=b5c64cce8e7813090809a3e4de8f88e148f84392 diff --git a/CMakeLists.txt b/CMakeLists.txt index fb704145..bbf5e57f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -364,12 +364,6 @@ add_feature_info("SSL support in Qt" HAVE_SSL "Use secure network connections") # Additional compile settings ##################################################################### -# This sets -fPIC and friends if required by the installed Qt5 library -if (Qt5_POSITION_INDEPENDENT_CODE) - set(CMAKE_POSITION_INDEPENDENT_CODE ON) - set(CMAKE_REQUIRED_FLAGS "-DQT_NO_VERSION_TAGGING") -endif() - # Needed to compile with mingw without kde if (MINGW AND NOT WITH_KDE) add_definitions(-D_WIN32_WINNT=0x0500) @@ -378,11 +372,6 @@ if (MINGW AND NOT WITH_KDE) add_definitions(-U__STRICT_ANSI__) endif() -# Sanitize compiler flags - old versions of KDE set -ansi, which breaks -std=c++11 -if (CMAKE_COMPILER_IS_GNUCXX) - string(REPLACE "-ansi" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) -endif() - # Setup LDAP Authentication support. ##################################################################### if (WITH_LDAP) @@ -448,7 +437,6 @@ if (WIN32) set(CMAKE_EXE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:YES /NODEFAULTLIB:libcmt") set(CMAKE_EXE_LINKER_FLAGS_DEBUGFULL "${CMAKE_EXE_LINKER_FLAGS_DEBUG}") link_libraries(Version dwmapi shlwapi) - set(QT_QTMAIN_LIBRARY Qt5::WinMain) endif() endif()