diff --git a/cd_utils/CMakeLists.txt b/cd_utils/CMakeLists.txt index 42f0fa7..673caaf 100644 --- a/cd_utils/CMakeLists.txt +++ b/cd_utils/CMakeLists.txt @@ -47,9 +47,9 @@ message(STATUS "Building ${PROJECT_NAME}") install(FILES ${HDRS_UTILS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() - message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") + #message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() install(TARGETS ${PROJECT_NAME} DESTINATION bin) - message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") + #message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") endif() #endif() diff --git a/qad/QtWraps.cmake b/qad/QtWraps.cmake index ec97e85..1ae3cd4 100644 --- a/qad/QtWraps.cmake +++ b/qad/QtWraps.cmake @@ -92,6 +92,11 @@ macro(find_qt) #message("Qt5: plugins dir: ${Qt5_PLUGINS_DIR}") break() endforeach() + if ("x${Qt5_PLUGINS_DIR}" STREQUAL "x") + string(FIND "${Qt5_BIN}" "/" _ind REVERSE) + string(SUBSTRING "${Qt5_BIN}" 0 ${_ind} _l) + set(Qt5_PLUGINS_DIR "${_l}/plugins") + endif() if (NOT _QT5_MSG) message(STATUS "Found Qt5: ${_Qt5_qmake} (found version \"${Qt5_VERSION}\")") set(_QT5_MSG 1 CACHE BOOL "msg_qt5" FORCE)