From 647bfd230cdb4e833d5eab0258c3dd9147efa062 Mon Sep 17 00:00:00 2001
From: ababi <albert.babi@savoirfairelinux.com>
Date: Fri, 4 Dec 2020 15:33:21 +0100
Subject: [PATCH] cmake: Qt path verification
- check Qt path is set in order to build with a local installation
- avoid name "QT_MIN_VER" for the version used to build
Change-Id: I9bf81746ac407070a8c7efed503d4d00651f32e5
---
CMakeLists.txt | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9da88c43..a476d333 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)
--
GitLab