SHS/cmake
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lang fix

Browse Source
This commit is contained in:
Пелипенко Иван
2020-09-06 22:35:06 +03:00
parent 0255151d68
commit 0c2078ba50
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SHSTKMacros.cmake
View File

@@ -186,11 +186,9 @@ macro(shstk_install _dir is_app _target _h_files)
if(WIN32) if(WIN32)
if (${is_app}) if (${is_app})
install(TARGETS ${_target} DESTINATION ${MINGW_BIN}) install(TARGETS ${_target} DESTINATION ${MINGW_BIN})
install(TARGETS ${_target} DESTINATION QtBin)
else() else()
install(TARGETS ${_target} ARCHIVE DESTINATION ${MINGW_LIB}) install(TARGETS ${_target} ARCHIVE DESTINATION ${MINGW_LIB})
install(TARGETS ${_target} RUNTIME DESTINATION ${MINGW_BIN}) install(TARGETS ${_target} RUNTIME DESTINATION ${MINGW_BIN})
install(TARGETS ${_target} RUNTIME DESTINATION QtBin)
endif() endif()
else() else()
if (${is_app}) if (${is_app})

13
SHSTKQtMacros.cmake
View File

@@ -46,6 +46,13 @@ macro(shstk_qt_install _dir is_app _target _h_files _qm_files)
endif() endif()
endif() 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 (NOT "x${_target}" STREQUAL "x")
if(LOCAL) if(LOCAL)
if(${is_app}) 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) qt_install(TARGETS ${_target} DESTINATION lib)
endif() endif()
endif() endif()
if(NOT "x${_qm_files}" STREQUAL "x")
qt_install(LANG ${_qm_files} DESTINATION lang)
endif()
else() else()
if(WIN32) if(WIN32)
if (${is_app}) 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) qt_install(TARGETS ${_target} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
endif() endif()
endif() endif()
if(NOT "x${_qm_files}" STREQUAL "x")
qt_install(LANG ${_qm_files} DESTINATION QtLang)
endif()
endif() endif()
endif() endif()
endmacro() endmacro()