From 28b13b31aa21cf0a2b24e3fef02a53569754bb92 Mon Sep 17 00:00:00 2001 From: nds Date: Mon, 10 Feb 2020 17:00:39 +0300 Subject: [PATCH] 0031014: Inspectors - variables for Qt in CMake It restores path to Qt binaries in 3RDPARTY_DLL_DIRS for correct start TInspectorEXE under VStudio. --- adm/cmake/qt.cmake | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/adm/cmake/qt.cmake b/adm/cmake/qt.cmake index 6958bab562..535e6a2038 100644 --- a/adm/cmake/qt.cmake +++ b/adm/cmake/qt.cmake @@ -7,7 +7,8 @@ if (NOT DEFINED ${3RDPARTY_QT_DIR} AND ${3RDPARTY_QT_DIR} STREQUAL "") FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" Qt 3RDPARTY_QT_DIR_NAME) if (NOT DEFINED ${3RDPARTY_QT_DIR_NAME} AND ${3RDPARTY_QT_DIR_NAME} STREQUAL "") - message (FATAL_ERROR "... Qt root directory was not found") + set (3RDPARTY_QT_DIR "" CACHE PATH "The directory containing qt") + message (FATAL_ERROR "Could not find used third-party product: 3RDPARTY_QT_DIR") endif() # Combine directory name with absolute path and show in GUI @@ -31,4 +32,10 @@ if (NOT ${Qt5_FOUND}) #message (STATUS "Qt4 cmake configuration") else() #message (STATUS "Qt5 cmake configuration") -endif() \ No newline at end of file +endif() + +if (3RDPARTY_QT_DIR OR EXISTS "${3RDPARTY_QT_DIR}") + list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_QT_DIR}/bin") +else() + list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_QT_DLL_DIR) +endif()