noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Delete .pri files, move warnings to src/CMakeLists.txt (#3883)

Browse source
This commit is contained in:
Daniel Sage 2022-07-30 06:39:13 -04:00 committed by GitHub
parent 218718e930
commit bda060f42e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 53 additions and 179 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -43,7 +43,7 @@
- Bugfix: Adopt popup windows in order to force floating behavior on some window managers. (#3836)
- Bugfix: Fix split focusing being broken in certain circumstances when the "Show input when it's empty" setting was disabled. (#3838, #3860)
- Bugfix: Always refresh tab when a contained split's channel is set. (#3849)
- Dev: Remove official support for QMake. (#3839)
- Dev: Remove official support for QMake. (#3839, #3883)
- Dev: Rewrite LimitedQueue (#3798)
- Dev: Overhaul highlight system by moving all checks into a Controller allowing for easier tests. (#3399, #3801, #3835)
- Dev: Use Game Name returned by Get Streams instead of querying it from the Get Games API. (#3662)

25
lib/boost.pri
View file

@ -1,25 +0,0 @@
# boost
# Exposed build flags:
# - BOOST_DIRECTORY (C:\local\boost\ by default) (Windows only)
pajlada {
BOOST_DIRECTORY = C:\dev\projects\boost_1_66_0\
}
win32 {
isEmpty(BOOST_DIRECTORY) {
message(Using default boost directory C:\\local\\boost\\)
BOOST_DIRECTORY = C:\local\boost\
}
INCLUDEPATH += $$BOOST_DIRECTORY
isEmpty(BOOST_LIB_SUFFIX) {
message(Using default boost lib directory suffix lib)
BOOST_LIB_SUFFIX = lib
}
LIBS += -L$$BOOST_DIRECTORY\\$$BOOST_LIB_SUFFIX
} else {
LIBS += -lboost_system -lboost_filesystem
}

5
lib/libcommuni.pri
View file

@ -1,5 +0,0 @@
DEFINES += IRC_NAMESPACE=Communi
include(../lib/libcommuni/src/core/core.pri)
include(../lib/libcommuni/src/model/model.pri)
include(../lib/libcommuni/src/util/util.pri)

1
lib/lrucache.pri
View file

@ -1 +0,0 @@
INCLUDEPATH += $$PWD/lrucache/

1
lib/magic_enum.pri
View file

@ -1 +0,0 @@
INCLUDEPATH += $$PWD/magic_enum/include/

17
lib/openssl.pri
View file

@ -1,17 +0,0 @@
win32 {
isEmpty(OPENSSL_DIRECTORY) {
message(Using default openssl directory C:\\local\\openssl)
OPENSSL_DIRECTORY = C:\local\openssl
}
INCLUDEPATH += $$OPENSSL_DIRECTORY\\include
LIBS += -L$$OPENSSL_DIRECTORY\lib
LIBS += -llibssl
LIBS += -llibcrypto
} else {
PKGCONFIG += openssl
LIBS += -lssl -lcrypto
}

9
lib/qtkeychain.pri
View file

@ -1,9 +0,0 @@
freebsd {
INCLUDEPATH += /usr/local/include/qt5keychain
LIBS += -lqt5keychain
} else {
unix:!android:!macx:!ios {
DEFINES += KEYCHAIN_DBUS
}
include(qtkeychain/qt5keychain.pri)
}

15
lib/rapidjson.pri
View file

@ -1,15 +0,0 @@
# rapidjson
# Chatterino2 is tested with RapidJSON v1.1.0
# - RAPIDJSON_PREFIX ($$PWD by default)
# - RAPIDJSON_SYSTEM (1 = true) (Linux only, uses pkg-config)
!defined(RAPIDJSON_PREFIX) {
RAPIDJSON_PREFIX = $$PWD
}
linux:equals(RAPIDJSON_SYSTEM, "1") {
message("Building with system RapidJSON")
PKGCONFIG += RapidJSON
} else {
INCLUDEPATH += $$RAPIDJSON_PREFIX/rapidjson/include/
}

2
lib/serialize.pri
View file

@ -1,2 +0,0 @@
# serialize
INCLUDEPATH += $$PWD/serialize/include/

9
lib/settings.pri
View file

@ -1,9 +0,0 @@
# settings
DEFINES += PAJLADA_SETTINGS_BOOST_FILESYSTEM
SOURCES += \
$$PWD/settings/src/settings/settingdata.cpp \
$$PWD/settings/src/settings/settingmanager.cpp \
$$PWD/settings/src/settings/detail/realpath.cpp
INCLUDEPATH += $$PWD/settings/include/

2
lib/signals.pri
View file

@ -1,2 +0,0 @@
# signals
INCLUDEPATH += $$PWD/signals/include/

43
lib/warnings.pri
View file

@ -1,43 +0,0 @@
# Define warning flags for Chatterino
win32-msvc* {
QMAKE_CXXFLAGS_WARN_ON = /W4
# 4714 - function marked as __forceinline not inlined
# 4996 - occurs when the compiler encounters a function or variable that is marked as deprecated.
# These functions may have a different preferred name, may be insecure or have
# a more secure variant, or may be obsolete.
# 4505 - unreferenced local version has been removed
# 4127 - conditional expression is constant
# 4503 - decorated name length exceeded, name was truncated
# 4100 - unreferences formal parameter
# 4305 - possible truncation of data
# 4267 - possible loss of data in return
QMAKE_CXXFLAGS_WARN_ON += /wd4714
QMAKE_CXXFLAGS_WARN_ON += /wd4996
QMAKE_CXXFLAGS_WARN_ON += /wd4505
QMAKE_CXXFLAGS_WARN_ON += /wd4127
QMAKE_CXXFLAGS_WARN_ON += /wd4503
QMAKE_CXXFLAGS_WARN_ON += /wd4100
QMAKE_CXXFLAGS_WARN_ON += /wd4305
QMAKE_CXXFLAGS_WARN_ON += /wd4267
} else {
QMAKE_CXXFLAGS_WARN_ON = -Wall
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-function
QMAKE_CXXFLAGS_WARN_ON += -Wno-switch
QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-declarations
QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-variable
# Disabling strict-aliasing warnings for now, although we probably want to re-enable this in the future
QMAKE_CXXFLAGS_WARN_ON += -Wno-strict-aliasing
QMAKE_CXXFLAGS_WARN_ON += -Werror=return-type
CXX_VERSION = $$system($$QMAKE_CXX --version)
contains(CXX_VERSION, "clang") {
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-local-typedef
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-private-field
} else {
QMAKE_CXXFLAGS_WARN_ON += -Wno-class-memaccess
}
}

20
lib/websocketpp.pri
View file

@ -1,20 +0,0 @@
# websocketpp
# Chatterino2 is tested with websocketpp 0.8.1
# Exposed build flags:
# - WEBSOCKETPP_PREFIX ($$PWD by default)
# - WEBSOCKETPP_SYSTEM (1 = true) (unix only)
!defined(WEBSOCKETPP_PREFIX) {
WEBSOCKETPP_PREFIX = $$PWD
}
unix {
equals(WEBSOCKETPP_SYSTEM, "1") {
message("Building with system websocketpp")
} else {
message("Building with websocketpp submodule (Prefix: $$WEBSOCKETPP_PREFIX)")
INCLUDEPATH += $$WEBSOCKETPP_PREFIX/websocketpp/
}
} else {
INCLUDEPATH += $$WEBSOCKETPP_PREFIX/websocketpp
}

24
lib/winsdk.pri
View file

@ -1,24 +0,0 @@
win32 {
LIBS += -luser32
}
# Optional dependency on Windows SDK 7
!contains(QMAKE_TARGET.arch, x86_64) {
win32:exists(C:\Program Files\Microsoft SDKs\Windows\v7.1\Include\Windows.h) {
LIBS += -L"C:\Program Files\Microsoft SDKs\Windows\v7.1\Lib" -ldwmapi
DEFINES += "USEWINSDK"
message(Using Windows SDK 7)
}
}
# Optional dependency on Windows SDK 10
contains(QMAKE_TARGET.arch, x86_64) {
WIN_SDK_VERSION = $$(WindowsSDKVersion)
!isEmpty(WIN_SDK_VERSION) {
!equals(WIN_SDK_VERSION, "\\") {
DEFINES += "USEWINSDK"
message(Using Windows SDK 10)
}
}
}

5
lib/wintoast.pri
View file

@ -1,5 +0,0 @@
win32 {
INCLUDEPATH += $$PWD/../lib/wintoast/src/
SOURCES += \
$$PWD/../lib/WinToast/src/wintoastlib.cpp
}

52
src/CMakeLists.txt
View file

@ -729,3 +729,55 @@ if (LIBRT)
)
endif ()
# Configure compiler warnings
if (MSVC)
# 4714 - function marked as __forceinline not inlined
# 4996 - occurs when the compiler encounters a function or variable that is marked as deprecated.
# These functions may have a different preferred name, may be insecure or have
# a more secure variant, or may be obsolete.
# 4505 - unreferenced local version has been removed
# 4127 - conditional expression is constant
# 4503 - decorated name length exceeded, name was truncated
# 4100 - unreferences formal parameter
# 4305 - possible truncation of data
# 4267 - possible loss of data in return
target_compile_options(${LIBRARY_PROJECT} PUBLIC
/W4
# Disable the following warnings
/wd4714
/wd4996
/wd4505
/wd4127
/wd4503
/wd4100
/wd4305
/wd4267
)
else ()
target_compile_options(${LIBRARY_PROJECT} PUBLIC
-Wall
# Disable the following warnings
-Wno-unused-function
-Wno-switch
-Wno-deprecated-declarations
-Wno-sign-compare
-Wno-unused-variable
# Disabling strict-aliasing warnings for now, although we probably want to re-enable this in the future
-Wno-strict-aliasing
-Werror=return-type
)
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
target_compile_options(${LIBRARY_PROJECT} PUBLIC
-Wno-unused-local-typedef
-Wno-unused-private-field
)
else ()
target_compile_options(${LIBRARY_PROJECT} PUBLIC
-Wno-class-memaccess
)
endif()
endif ()