Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Utilities
Filelight
Commits
e72a35a9
Commit
e72a35a9
authored
Dec 22, 2021
by
Laurent Montel
Browse files
Adapt build system for building against qt6
parent
473eff07
Pipeline
#113289
passed with stage
in 44 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
e72a35a9
...
...
@@ -17,7 +17,7 @@ cmake_minimum_required (VERSION 3.16 FATAL_ERROR)
project
(
Filelight VERSION
${
FILELIGHT_VERSION
}
)
set
(
PROJECT_VERSION
${
RELEASE_SERVICE_VERSION
}
)
set
(
KF5_MIN_VERSION
"5.8
5
.0"
)
set
(
KF5_MIN_VERSION
"5.8
9
.0"
)
set
(
QT_REQUIRED_VERSION
"5.15.0"
)
find_package
(
ECM
${
KF5_MIN_VERSION
}
REQUIRED NO_MODULE
)
...
...
@@ -35,7 +35,10 @@ include(KDECMakeSettings)
include
(
KDECompilerSettings NO_POLICY_SCOPE
)
include
(
ECMQtDeclareLoggingCategory
)
find_package
(
Qt5
${
QT_REQUIRED_VERSION
}
CONFIG REQUIRED Core Widgets Svg
)
find_package
(
Qt
${
QT_MAJOR_VERSION
}
${
QT_REQUIRED_VERSION
}
CONFIG REQUIRED Core Widgets Svg
)
if
(
QT_MAJOR_VERSION STREQUAL
"6"
)
find_package
(
Qt6Core5Compat
)
endif
()
find_package
(
KF5
${
KF5_MIN_VERSION
}
REQUIRED
XmlGui
# For app
KIO
# For part
...
...
autotests/CMakeLists.txt
View file @
e72a35a9
include
(
ECMAddTests
)
find_package
(
Qt
5
Test
${
QT_MIN_VERSION
}
REQUIRED Test
)
find_package
(
Qt
${
QT_MAJOR_VERSION
}
Test
${
QT_MIN_VERSION
}
REQUIRED Test
)
find_package
(
KF5CoreAddons
${
KF5_DEP_VERSION
}
REQUIRED
)
add_subdirectory
(
core
)
autotests/core/CMakeLists.txt
View file @
e72a35a9
...
...
@@ -6,6 +6,6 @@ SET(FILENAME_TEST_SRCS
ecm_add_test
(
${
FILENAME_TEST_SRCS
}
TEST_NAME
"filetree_test"
LINK_LIBRARIES Qt::Test
LINK_LIBRARIES Qt
${
QT_MAJOR_VERSION
}
::Test
KF5::CoreAddons
)
misc/CMakeLists.txt
View file @
e72a35a9
...
...
@@ -6,7 +6,7 @@
install
(
PROGRAMS org.kde.filelight.desktop DESTINATION
${
KDE_INSTALL_APPDIR
}
)
install
(
FILES filelightrc DESTINATION
${
KDE_INSTALL_CONFDIR
}
)
install
(
FILES filelightui.rc DESTINATION
${
KDE_INSTALL_KXMLGUI
5
DIR
}
/
/
filelight
)
install
(
FILES filelightui.rc DESTINATION
${
KDE_INSTALL_KXMLGUIDIR
}
/filelight
)
install
(
FILES org.kde.filelight.appdata.xml DESTINATION
${
KDE_INSTALL_METAINFODIR
}
)
ecm_install_icons
(
ICONS
...
...
src/CMakeLists.txt
View file @
e72a35a9
...
...
@@ -59,7 +59,7 @@ target_link_libraries(filelight
KF5::I18n
KF5::XmlGui
KF5::KIOWidgets
# Only used for KDirLister, may be able to move away from that.
Qt::Svg
Qt
${
QT_MAJOR_VERSION
}
::Svg
)
if
(
WIN32
)
find_package
(
KDEWin REQUIRED
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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