Commit 44f85cf6 authored by Jan Möbius's avatar Jan Möbius
Browse files

Merged master

parents 8b545dbe 484e5bd8
Pipeline #18976 passed with stage
in 7 seconds
......@@ -27,7 +27,7 @@ macro (vci_qt)
set (QT_INSTALL_PATH_EXISTS TRUE)
else()
set (QT_INSTALL_PATH_EXISTS FALSE)
endif()
endif(EXISTS "${QT_INSTALL_PATH}")
set(QT_FINDER_FLAGS "" CACHE STRING "Flags for the Qt finder e.g.
NO_DEFAULT_PATH if no system installed Qt shall be found")
......@@ -131,7 +131,7 @@ macro (vci_qt)
else()
get_target_property(_QT_BINARY_DIR "Qt${QT_DEFAULT_MAJOR_VERSION}::uic" LOCATION)
get_filename_component(_QT_BINARY_DIR ${_QT_BINARY_DIR} PATH)
endif()
endif(QT_INSTALL_PATH_EXISTS)
set (QT_BINARY_DIR "${_QT_BINARY_DIR}" CACHE PATH "Qt binary Directory")
mark_as_advanced(QT_BINARY_DIR)
......
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