Skip to content
Snippets Groups Projects
Commit 2d3b1f01 authored by Ming Rui Zhang's avatar Ming Rui Zhang Committed by Andreas Traczyk
Browse files

cmake: make comparisons instead of match for qt versions

Change-Id: Iebef57d2ede318c6cd651cef697d286057aec6b9
parent 8cd7250d
No related branches found
No related tags found
No related merge requests found
...@@ -75,7 +75,13 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LOCAL_CMAKE_MODULE_PATH}) ...@@ -75,7 +75,13 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LOCAL_CMAKE_MODULE_PATH})
FIND_PACKAGE(Ring REQUIRED) FIND_PACKAGE(Ring REQUIRED)
if (${QT_MIN_VER} MATCHES "5.14") if(QT_MIN_VER)
string(REPLACE "." ";" VERSION_LIST ${QT_MIN_VER})
list(GET VERSION_LIST 0 QT_MIN_VER_MAJOR)
list(GET VERSION_LIST 1 QT_MIN_VER_MINOR)
list(GET VERSION_LIST 2 QT_MIN_VER_PATCH)
if ((${QT_MIN_VER_MAJOR} GREATER_EQUAL 5) AND (${QT_MIN_VER_MINOR} GREATER_EQUAL 14))
message(STATUS "Using custom Qt version") message(STATUS "Using custom Qt version")
find_package(Qt5 ${QT_MIN_VER} REQUIRED find_package(Qt5 ${QT_MIN_VER} REQUIRED
COMPONENTS Core DBus Sql Gui COMPONENTS Core DBus Sql Gui
...@@ -85,6 +91,7 @@ if (${QT_MIN_VER} MATCHES "5.14") ...@@ -85,6 +91,7 @@ if (${QT_MIN_VER} MATCHES "5.14")
COMPONENTS LinguistTools COMPONENTS LinguistTools
PATHS ${QT5_PATH} NO_DEFAULT_PATH) PATHS ${QT5_PATH} NO_DEFAULT_PATH)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true)
endif()
else() else()
find_package(Qt5 REQUIRED find_package(Qt5 REQUIRED
COMPONENTS Core DBus Sql Gui) COMPONENTS Core DBus Sql Gui)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment