Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Okteta
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
3
Issues
3
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Utilities
Okteta
Commits
6ade3f09
Commit
6ade3f09
authored
May 18, 2016
by
Friedrich W. H. Kossebau
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make Qt5Designer plugin dep optional, use Qt5UiPlugin with >=5.5
parent
381387f8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
2 deletions
+24
-2
CMakeLists.txt
CMakeLists.txt
+15
-1
designer/CMakeLists.txt
designer/CMakeLists.txt
+9
-1
No files found.
CMakeLists.txt
View file @
6ade3f09
...
...
@@ -25,7 +25,6 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED
COMPONENTS
Core
Network
Designer
PrintSupport
Script
ScriptTools
...
...
@@ -37,6 +36,21 @@ if (NOT Qt5Test_FOUND)
message
(
STATUS
"Qt5Test not found, unit tests will not be built."
)
endif
()
find_package
(
Qt5Designer
${
REQUIRED_QT_VERSION
}
CONFIG QUIET
)
set_package_properties
(
Qt5Designer PROPERTIES TYPE OPTIONAL
PURPOSE
"Required to build Qt Designer plugins"
)
if
(
NOT Qt5Designer_VERSION_STRING VERSION_LESS 5.5.0
)
find_package
(
Qt5UiPlugin
${
REQUIRED_QT_VERSION
}
CONFIG QUIET
)
set_package_properties
(
Qt5UiPlugin PROPERTIES TYPE OPTIONAL
PURPOSE
"Required to build Qt Designer plugins"
)
if
(
Qt5UiPlugin_FOUND
)
# for some reason, Qt5UiPlugin does not set its _INCLUDE_DIRS variable. Fill it manually
get_target_property
(
Qt5UiPlugin_INCLUDE_DIRS Qt5::UiPlugin INTERFACE_INCLUDE_DIRECTORIES
)
endif
()
endif
()
set
(
REQUIRED_KF5_VERSION
"5.7.0"
)
find_package
(
KF5
${
REQUIRED_KF5_VERSION
}
REQUIRED
...
...
designer/CMakeLists.txt
View file @
6ade3f09
if
(
NOT Qt5Designer_FOUND
)
return
()
endif
()
set
(
oktetadesignerplugin_SRCS
bytearraycolumnviewdesignerfactory.cpp
bytearrayrowviewdesignerfactory.cpp
...
...
@@ -12,7 +16,11 @@ target_link_libraries( oktetadesignerplugin
OktetaGui
OktetaCore
Qt5::Widgets
Qt5::Designer
)
target_include_directories
(
oktetadesignerplugin
PRIVATE
${
Qt5UiPlugin_INCLUDE_DIRS
}
${
Qt5Designer_INCLUDE_DIRS
}
)
install
(
TARGETS oktetadesignerplugin DESTINATION
${
QT_PLUGIN_INSTALL_DIR
}
/designer
)
...
...
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