projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: Remove some compiler flags that are no longer needed
[quassel.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
508456e
..
bbf5e57
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-84,13
+84,6
@@
add_feature_info(WITH_BUNDLED_ICONS WITH_BUNDLED_ICONS "Install required icons f
option(WITH_OXYGEN_ICONS "Support the Oxygen icon theme (KDE4)" OFF)
add_feature_info(WITH_OXYGEN_ICONS WITH_OXYGEN_ICONS "Support the Oxygen icon theme (KDE4)")
option(WITH_OXYGEN_ICONS "Support the Oxygen icon theme (KDE4)" OFF)
add_feature_info(WITH_OXYGEN_ICONS WITH_OXYGEN_ICONS "Support the Oxygen icon theme (KDE4)")
-if (WITH_BUNDLED_ICONS)
- add_definitions(-DWITH_BUNDLED_ICONS)
-endif()
-if (WITH_OXYGEN_ICONS)
- add_definitions(-DWITH_OXYGEN_ICONS)
-endif()
-
# For this, the feature info is added after we know if QtWebkit is installed
option(WITH_WEBKIT "WebKit support (for link previews) (legacy)" OFF)
# For this, the feature info is added after we know if QtWebkit is installed
option(WITH_WEBKIT "WebKit support (for link previews) (legacy)" OFF)
@@
-371,12
+364,6
@@
add_feature_info("SSL support in Qt" HAVE_SSL "Use secure network connections")
# Additional compile settings
#####################################################################
# 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)
# Needed to compile with mingw without kde
if (MINGW AND NOT WITH_KDE)
add_definitions(-D_WIN32_WINNT=0x0500)
@@
-385,11
+372,6
@@
if (MINGW AND NOT WITH_KDE)
add_definitions(-U__STRICT_ANSI__)
endif()
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)
# Setup LDAP Authentication support.
#####################################################################
if (WITH_LDAP)
@@
-434,20
+416,16
@@
if (NOT WIN32)
add_feature_info("syslog.h" HAVE_SYSLOG "Provide support for logging to the syslog")
endif()
add_feature_info("syslog.h" HAVE_SYSLOG "Provide support for logging to the syslog")
endif()
+if (NOT WIN32)
+ check_function_exists(umask HAVE_UMASK)
+endif()
+
if (EMBED_DATA)
message(STATUS "Embedding data files into the binary")
else()
message(STATUS "Installing data files separately")
endif()
if (EMBED_DATA)
message(STATUS "Embedding data files into the binary")
else()
message(STATUS "Installing data files separately")
endif()
-if (NOT WIN32)
- check_function_exists(umask HAVE_UMASK)
- if(HAVE_UMASK)
- add_definitions(-DHAVE_UMASK)
- endif()
-endif()
-
-
# Windows-specific stuff
#####################################################################
# Windows-specific stuff
#####################################################################
@@
-459,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(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()
endif()
endif()