Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenFlipper
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
f6c8e0fd
Commit
f6c8e0fd
authored
May 16, 2018
by
Jan Möbius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'update_qwt_finder' into 'master'
Find QWT matching QT 5.10.1 See merge request
!100
parents
2b77f24a
1729a895
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
7 deletions
+11
-7
cmake/FindQwt6.cmake
cmake/FindQwt6.cmake
+11
-7
No files found.
cmake/FindQwt6.cmake
View file @
f6c8e0fd
...
...
@@ -28,13 +28,17 @@ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*" )
endif
()
if
(
QT5_FOUND
)
if
(
${
Qt5Core_VERSION_STRING
}
VERSION_EQUAL
"5.9.0"
)
SET
(
ACG_SEARCH_PATH
"/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.9.0"
)
else
()
if
(
${
Qt5Core_VERSION_STRING
}
VERSION_EQUAL
"5.8.0"
OR
${
Qt5Core_VERSION_STRING
}
VERSION_GREATER
"5.5.1"
)
SET
(
ACG_SEARCH_PATH
"/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.8.0"
)
else
()
SET
(
ACG_SEARCH_PATH
"/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1-qt5"
)
if
(
${
Qt5Core_VERSION_STRING
}
VERSION_EQUAL
"5.10.1"
)
SET
(
ACG_SEARCH_PATH
"/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.10.1"
)
else
()
if
(
${
Qt5Core_VERSION_STRING
}
VERSION_EQUAL
"5.9.0"
)
SET
(
ACG_SEARCH_PATH
"/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.9.0"
)
else
()
if
(
${
Qt5Core_VERSION_STRING
}
VERSION_EQUAL
"5.8.0"
OR
${
Qt5Core_VERSION_STRING
}
VERSION_GREATER
"5.5.1"
)
SET
(
ACG_SEARCH_PATH
"/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.8.0"
)
else
()
SET
(
ACG_SEARCH_PATH
"/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1-qt5"
)
endif
()
endif
()
endif
()
else
()
...
...
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