Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
b63911c1
Commit
b63911c1
authored
May 14, 2020
by
Martyn Gigg
Browse files
Find common Qt5 dependencies once
parent
5d1c3371
Changes
3
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
b63911c1
...
...
@@ -156,6 +156,7 @@ if(ENABLE_WORKBENCH)
if
(
Qt5_FOUND
)
message
(
STATUS
"Found Qt
${
Qt5_VERSION
}
:
${
Qt5_DIR
}
"
)
endif
()
find_package
(
QScintillaQt5 REQUIRED
)
find_package
(
PyQt5 REQUIRED
)
find_package
(
SIP REQUIRED
)
separate_arguments
(
PYQT5_SIP_FLAGS
)
...
...
qt/python/mantidqt/CMakeLists.txt
View file @
b63911c1
...
...
@@ -53,8 +53,6 @@ endif()
# Wrapper module linked against Qt5
if
(
ENABLE_WORKBENCH
)
find_package
(
QScintillaQt5 REQUIRED
)
mtd_add_sip_module
(
MODULE_NAME _commonqt5
TARGET_NAME mantidqt_commonqt5
HEADER_DEPS
...
...
qt/widgets/common/CMakeLists.txt
View file @
b63911c1
...
...
@@ -845,10 +845,6 @@ if(ENABLE_WORKBENCH)
endif
()
endif
()
find_package
(
QScintillaQt5
REQUIRED
)
endif
()
mtd_add_qt_library
(
...
...
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