Commit 433027af authored by Andreas Traczyk's avatar Andreas Traczyk

cmake(win): add missing base Qt5_DIR required by find_package

Now that we're using find_package(Qt5 COMPONENTS [...]) syntax,
cmake searches for a base Qt5 cmake directory as well, on windows.

Change-Id: I287d97e8429cb0f33f454d29b450c020c8861708
Gitlab: #581
parent fc467b58
......@@ -133,12 +133,9 @@ def generate(force, qtver, sdk, toolset, arch):
qt_dir = 'C:\\Qt\\' + qtver
cmake_gen = getCMakeGenerator(getLatestVSVersion())
qtFolderDir = "msvc2017_64"
qtverSplit = qtver.split('.')
if((int(qtverSplit[0]) >= 6) or ((int(qtverSplit[0]) == 5) and (int(qtverSplit[1]) >= 15))):
qtFolderDir = "msvc2019_64"
qt_cmake_dir = qt_dir + '\\' + qtFolderDir + '\\lib\\cmake\\'
qt_cmake_dir = qt_dir + '\\msvc2019_64\\lib\\cmake\\'
cmake_options = [
'-DQt5_DIR=' + qt_cmake_dir + 'Qt5',
'-DQt5Core_DIR=' + qt_cmake_dir + 'Qt5Core',
'-DQt5Sql_DIR=' + qt_cmake_dir + 'Qt5Sql',
'-DQt5LinguistTools_DIR=' + qt_cmake_dir + 'Qt5LinguistTools',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment