diff --git a/CMakeLists.txt b/CMakeLists.txt index 9da88c43e42380d3d9a87b10f4acb846a336630f..a476d3338ab55ee8781c601bf90a5cf94248f71e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,19 +75,19 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LOCAL_CMAKE_MODULE_PATH}) FIND_PACKAGE(Ring REQUIRED) -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(QT5_VER AND QT5_PATH) + string(REPLACE "." ";" VERSION_LIST ${QT5_VER}) + list(GET VERSION_LIST 0 QT5_VER_MAJOR) + list(GET VERSION_LIST 1 QT5_VER_MINOR) + list(GET VERSION_LIST 2 QT5_VER_PATCH) - if ((${QT_MIN_VER_MAJOR} GREATER_EQUAL 5) AND (${QT_MIN_VER_MINOR} GREATER_EQUAL 14)) + if ((${QT5_VER_MAJOR} GREATER_EQUAL 5) AND (${QT5_VER_MINOR} GREATER_EQUAL 14)) message(STATUS "Using custom Qt version") - find_package(Qt5 ${QT_MIN_VER} REQUIRED + find_package(Qt5 ${QT5_VER} REQUIRED COMPONENTS Core DBus Sql Gui PATHS ${QT5_PATH} NO_DEFAULT_PATH) # Linguist tools is not required. - find_package(Qt5 ${QT_MIN_VER} + find_package(Qt5 ${QT5_VER} COMPONENTS LinguistTools PATHS ${QT5_PATH} NO_DEFAULT_PATH) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true)