From 628a54bc6853e911401cd885da315ed806c0aa35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Mon, 16 Mar 2020 12:41:06 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@804 a8b55f48-bf90-11e4-a774-851b48703e85 --- SDKMacros.cmake | 4 ++-- qad/CMakeLists.txt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SDKMacros.cmake b/SDKMacros.cmake index d0a1b75..69b17d4 100644 --- a/SDKMacros.cmake +++ b/SDKMacros.cmake @@ -16,7 +16,7 @@ macro(sdk_install _DIR _TARGET _H_FILES _QM_FILES) qt_install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() if(NOT "x${_QM_FILES}" STREQUAL "x") - qt_install(FILES ${_QM_FILES} DESTINATION QtLang) + qt_install(LANG ${_QM_FILES} DESTINATION QtLang) endif() else() if(NOT "x${_H_FILES}" STREQUAL "x") @@ -25,7 +25,7 @@ macro(sdk_install _DIR _TARGET _H_FILES _QM_FILES) qt_install(TARGETS ${_TARGET} RUNTIME DESTINATION bin) qt_install(TARGETS ${_TARGET} DESTINATION lib) if(NOT "x${_QM_FILES}" STREQUAL "x") - qt_install(FILES ${_QM_FILES} DESTINATION lang) + qt_install(LANG ${_QM_FILES} DESTINATION lang) endif() endif() endmacro() diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt index 8ce1d17..b3663f9 100644 --- a/qad/CMakeLists.txt +++ b/qad/CMakeLists.txt @@ -83,7 +83,7 @@ macro(qad_install _TARGET _H_FILES _QM_FILES) qt_install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() if(NOT "x${_QM_FILES}" STREQUAL "x") - qt_install(FILES ${_QM_FILES} DESTINATION QtLang) + qt_install(LANG ${_QM_FILES} DESTINATION QtLang) endif() else() qt_install(TARGETS ${_TARGET} RUNTIME DESTINATION bin) @@ -92,7 +92,7 @@ macro(qad_install _TARGET _H_FILES _QM_FILES) install(FILES ${_H_FILES} DESTINATION include/qad) endif() if(NOT "x${_QM_FILES}" STREQUAL "x") - qt_install(FILES ${_QM_FILES} DESTINATION lang) + qt_install(LANG ${_QM_FILES} DESTINATION lang) endif() endif() endif() @@ -127,7 +127,7 @@ macro(qad_project NAME _MODULES _LIBS) qt_target_compile_definitions(${PROJ_NAME} PRIVATE QAD_SHARED_DEFINE) endif() qt_target_link_libraries(${PROJ_NAME} ${_LIBS}) - qad_install(${PROJ_NAME} "${out_HDR}" "${out_QM_Qt5}") + qad_install(${PROJ_NAME} "${out_HDR}" "out_QM") set(${NAME}_UTILS 1) if (LIBPROJECT) set(${NAME}_UTILS ${UTILS})