diff --git a/SHSTKMacros.cmake b/SHSTKMacros.cmake index 42bec61..d0f5386 100644 --- a/SHSTKMacros.cmake +++ b/SHSTKMacros.cmake @@ -186,11 +186,9 @@ macro(shstk_install _dir is_app _target _h_files) if(WIN32) if (${is_app}) install(TARGETS ${_target} DESTINATION ${MINGW_BIN}) - install(TARGETS ${_target} DESTINATION QtBin) else() install(TARGETS ${_target} ARCHIVE DESTINATION ${MINGW_LIB}) install(TARGETS ${_target} RUNTIME DESTINATION ${MINGW_BIN}) - install(TARGETS ${_target} RUNTIME DESTINATION QtBin) endif() else() if (${is_app}) diff --git a/SHSTKQtMacros.cmake b/SHSTKQtMacros.cmake index edc7924..c7d7d6c 100644 --- a/SHSTKQtMacros.cmake +++ b/SHSTKQtMacros.cmake @@ -46,6 +46,13 @@ macro(shstk_qt_install _dir is_app _target _h_files _qm_files) endif() endif() endif() + if(NOT "x${_qm_files}" STREQUAL "x") + if(LOCAL) + qt_install(LANG ${_qm_files} DESTINATION lang) + else() + qt_install(LANG ${_qm_files} DESTINATION QtLang) + endif() + endif() if (NOT "x${_target}" STREQUAL "x") if(LOCAL) if(${is_app}) @@ -58,9 +65,6 @@ macro(shstk_qt_install _dir is_app _target _h_files _qm_files) qt_install(TARGETS ${_target} DESTINATION lib) endif() endif() - if(NOT "x${_qm_files}" STREQUAL "x") - qt_install(LANG ${_qm_files} DESTINATION lang) - endif() else() if(WIN32) if (${is_app}) @@ -78,9 +82,6 @@ macro(shstk_qt_install _dir is_app _target _h_files _qm_files) qt_install(TARGETS ${_target} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() endif() - if(NOT "x${_qm_files}" STREQUAL "x") - qt_install(LANG ${_qm_files} DESTINATION QtLang) - endif() endif() endif() endmacro()