From aca408fcacd1a1c6a33439e0af9d3e3a953a79ab 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: Wed, 18 Mar 2020 18:37:04 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@830 a8b55f48-bf90-11e4-a774-851b48703e85 --- SDKMacros.cmake | 2 +- cd_utils/CMakeLists.txt | 2 +- piqt/CMakeLists.txt | 2 +- piqt_utils/CMakeLists.txt | 2 +- qad/CMakeLists.txt | 6 +++++- qcd_utils/CMakeLists.txt | 2 +- qglengine/CMakeLists.txt | 2 +- qglview/CMakeLists.txt | 2 +- 8 files changed, 12 insertions(+), 8 deletions(-) diff --git a/SDKMacros.cmake b/SDKMacros.cmake index a6258a0..ce31649 100644 --- a/SDKMacros.cmake +++ b/SDKMacros.cmake @@ -13,7 +13,7 @@ macro(sdk_install _DIR _TARGET _H_FILES _QM_FILES) if (NOT "x${_H_FILES}" STREQUAL "x") install(FILES ${_H_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${_DIR}) endif() - qt_install(TARGETS ${_TARGET} ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + qt_install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() if(NOT "x${_QM_FILES}" STREQUAL "x") qt_install(LANG ${_QM_FILES} DESTINATION QtLang) diff --git a/cd_utils/CMakeLists.txt b/cd_utils/CMakeLists.txt index df47577..6424091 100644 --- a/cd_utils/CMakeLists.txt +++ b/cd_utils/CMakeLists.txt @@ -74,7 +74,7 @@ if(LIB) install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${MINGW_BIN}) else() install(FILES ${HDRS_UTILS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) - install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() #message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() diff --git a/piqt/CMakeLists.txt b/piqt/CMakeLists.txt index dd9ad21..4f5fcd8 100644 --- a/piqt/CMakeLists.txt +++ b/piqt/CMakeLists.txt @@ -36,7 +36,7 @@ else() qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION QtBin) else() install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip) - qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() diff --git a/piqt_utils/CMakeLists.txt b/piqt_utils/CMakeLists.txt index 7d6c6f5..10d2789 100644 --- a/piqt_utils/CMakeLists.txt +++ b/piqt_utils/CMakeLists.txt @@ -60,7 +60,7 @@ else() qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION QtBin) else() install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip) - qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt index 6b8e8d1..ba2858b 100644 --- a/qad/CMakeLists.txt +++ b/qad/CMakeLists.txt @@ -112,7 +112,11 @@ macro(qad_plugin NAME _MODULES _LIBS) qt_wrap(${SRC} CPPS out_CPP QMS out_QM) qt_add_library(${PROJ_NAME} SHARED out_CPP) qt_target_link_libraries(${PROJ_NAME} ${_LIBS} qad_${NAME} ${_${NAME}_PLUGIN_LIBS}) - qt_install(TARGETS ${PROJ_NAME} RUNTIME DESTINATION QtPlugins/designer) + if (WIN32) + qt_install(TARGETS ${PROJ_NAME} RUNTIME DESTINATION QtPlugins/designer) + else() + qt_install(TARGETS ${PROJ_NAME} DESTINATION QtPlugins/designer) + endif() endif() endif() endmacro() diff --git a/qcd_utils/CMakeLists.txt b/qcd_utils/CMakeLists.txt index f9a271e..45fb33b 100644 --- a/qcd_utils/CMakeLists.txt +++ b/qcd_utils/CMakeLists.txt @@ -36,7 +36,7 @@ else() qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION QtBin) else() install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) - qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() diff --git a/qglengine/CMakeLists.txt b/qglengine/CMakeLists.txt index 070d008..cbf1999 100644 --- a/qglengine/CMakeLists.txt +++ b/qglengine/CMakeLists.txt @@ -50,7 +50,7 @@ else() qt_install(TARGETS qglengine_core RUNTIME DESTINATION QtBin) else() qt_install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qglengine) - qt_install(TARGETS qglengine_core ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + qt_install(TARGETS qglengine_core DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() message(STATUS "Install qglengine_core to system \"${CMAKE_INSTALL_PREFIX}\"") else() diff --git a/qglview/CMakeLists.txt b/qglview/CMakeLists.txt index bab0769..82e45d6 100644 --- a/qglview/CMakeLists.txt +++ b/qglview/CMakeLists.txt @@ -37,7 +37,7 @@ else() qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION QtBin) else() qt_install(FILES ${H} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qad) - qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else()