Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Games
KTuberling
Commits
a0d24047
Commit
a0d24047
authored
Jun 08, 2021
by
Albert Astals Cid
Browse files
Revert the last 3 commits
parent
150db1fa
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
a0d24047
cmake_minimum_required
(
VERSION 3.
16
FATAL_ERROR
)
cmake_minimum_required
(
VERSION 3.
5
FATAL_ERROR
)
# KDE Application Version, managed by release script
set
(
RELEASE_SERVICE_VERSION_MAJOR
"21"
)
...
...
@@ -8,8 +8,8 @@ set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_
project
(
ktuberling VERSION
${
RELEASE_SERVICE_VERSION
}
)
set
(
QT_MIN_VERSION
"5.1
5
.0"
)
set
(
KF5_MIN_VERSION
"5.8
3
.0"
)
set
(
QT_MIN_VERSION
"5.1
2
.0"
)
set
(
KF5_MIN_VERSION
"5.
6
8.0"
)
find_package
(
ECM
${
KF5_MIN_VERSION
}
REQUIRED CONFIG
)
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
${
ECM_MODULE_PATH
}
)
...
...
@@ -71,16 +71,16 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Android")
main_mobile.cpp
)
qt_add_resources
(
ktuberling_mobile_SRCS android_data/resources.qrc
)
qt
5
_add_resources
(
ktuberling_mobile_SRCS android_data/resources.qrc
)
add_executable
(
ktuberling_mobile
${
ktuberling_mobile_SRCS
}
)
target_link_libraries
(
ktuberling_mobile
Qt::Gui
Qt::Svg
Qt::Multimedia
Qt::Xml
Qt::Widgets
Qt
5
::Gui
Qt
5
::Svg
Qt
5
::Multimedia
Qt
5
::Xml
Qt
5
::Widgets
KF5::ConfigCore
)
install
(
TARGETS ktuberling_mobile RUNTIME DESTINATION bin
)
...
...
@@ -100,9 +100,9 @@ else()
add_executable
(
ktuberling
${
ktuberling_SRCS
}
)
target_link_libraries
(
ktuberling
Qt::PrintSupport
Qt::Svg
Qt::Multimedia
Qt
5
::PrintSupport
Qt
5
::Svg
Qt
5
::Multimedia
KF5::ConfigWidgets
KF5::Completion
KF5::Crash
...
...
CMakePresets.json
deleted
100644 → 0
View file @
150db1fa
{
"version"
:
2
,
"configurePresets"
:
[
{
"name"
:
"dev"
,
"displayName"
:
"Build as debug"
,
"generator"
:
"Ninja"
,
"binaryDir"
:
"${sourceDir}/build"
,
"cacheVariables"
:
{
"CMAKE_BUILD_TYPE"
:
"Debug"
,
"CMAKE_EXPORT_COMPILE_COMMANDS"
:
"ON"
}
},
{
"name"
:
"asan"
,
"displayName"
:
"Build with Asan support."
,
"generator"
:
"Ninja"
,
"binaryDir"
:
"${sourceDir}/build-asan"
,
"cacheVariables"
:
{
"CMAKE_BUILD_TYPE"
:
"Debug"
,
"ECM_ENABLE_SANITIZERS"
:
"'address;undefined'"
,
"CMAKE_EXPORT_COMPILE_COMMANDS"
:
"ON"
}
},
{
"name"
:
"unity"
,
"displayName"
:
"Build with CMake unity support."
,
"generator"
:
"Ninja"
,
"binaryDir"
:
"${sourceDir}/build-unity"
,
"cacheVariables"
:
{
"CMAKE_BUILD_TYPE"
:
"Debug"
,
"CMAKE_UNITY_BUILD"
:
"ON"
,
"CMAKE_EXPORT_COMPILE_COMMANDS"
:
"ON"
}
},
{
"name"
:
"release"
,
"displayName"
:
"Build as release mode."
,
"generator"
:
"Ninja"
,
"binaryDir"
:
"${sourceDir}/build-release"
,
"cacheVariables"
:
{
"CMAKE_BUILD_TYPE"
:
"Release"
}
},
{
"name"
:
"profile"
,
"displayName"
:
"profile"
,
"generator"
:
"Ninja"
,
"binaryDir"
:
"${sourceDir}/build-profile"
,
"cacheVariables"
:
{
"CMAKE_BUILD_TYPE"
:
"RelWithDebInfo"
,
"CMAKE_EXPORT_COMPILE_COMMANDS"
:
"ON"
}
},
{
"name"
:
"clazy"
,
"displayName"
:
"clazy"
,
"generator"
:
"Ninja"
,
"binaryDir"
:
"${sourceDir}/build-clazy"
,
"cacheVariables"
:
{
"CMAKE_BUILD_TYPE"
:
"Debug"
},
"environment"
:
{
"CXX"
:
"clazy"
,
"CCACHE_DISABLE"
:
"ON"
}
}
],
"buildPresets"
:
[
{
"name"
:
"dev"
,
"configurePreset"
:
"dev"
},
{
"name"
:
"clazy"
,
"configurePreset"
:
"clazy"
,
"environment"
:
{
"CLAZY_CHECKS"
:
"level0,level1,detaching-member,ifndef-define-typo,isempty-vs-count,qrequiredresult-candidates,reserve-candidates,signal-with-return-value,unneeded-cast,function-args-by-ref,function-args-by-value,returning-void-expression,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch,old-style-connect,qstring-allocations,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,qstring-varargs,level2,detaching-member,heap-allocated-small-trivial-type,isempty-vs-count,qstring-varargs,qvariant-template-instantiation,raw-environment-function,reserve-candidates,signal-with-return-value,thread-with-slots,no-ctor-missing-parent-argument,no-missing-typeinfo"
,
"CCACHE_DISABLE"
:
"ON"
}
}
]
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment