From 79db045ee103bc65f7b7c1588559513318ac9c1e 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 12:30:46 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@820 a8b55f48-bf90-11e4-a774-851b48703e85 --- piqt/CMakeLists.txt | 6 +++--- piqt_utils/CMakeLists.txt | 6 +++--- qad/CMakeLists.txt | 6 +++--- qcd_utils/CMakeLists.txt | 6 +++--- qglengine/CMakeLists.txt | 6 +++--- qglview/CMakeLists.txt | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/piqt/CMakeLists.txt b/piqt/CMakeLists.txt index fd14e34..dd9ad21 100644 --- a/piqt/CMakeLists.txt +++ b/piqt/CMakeLists.txt @@ -31,17 +31,17 @@ else() if(NOT "x${out_QM}" STREQUAL "x") qt_install(FILES ${out_QM} DESTINATION QtLang) endif() - qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) + qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION ${MINGW_LIB}) qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${MINGW_BIN}) qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION QtBin) else() install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION lib) + qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib) install(FILES ${out_HDR} DESTINATION include/pip) message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"") endif() diff --git a/piqt_utils/CMakeLists.txt b/piqt_utils/CMakeLists.txt index b54958f..7d6c6f5 100644 --- a/piqt_utils/CMakeLists.txt +++ b/piqt_utils/CMakeLists.txt @@ -55,17 +55,17 @@ else() if(LIB) if(WIN32) install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}/pip) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) + qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION ${MINGW_LIB}) qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${MINGW_BIN}) qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION QtBin) else() install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION lib) + qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib) install(FILES ${out_HDR} DESTINATION include/pip) message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"") endif() diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt index b3663f9..88ecab4 100644 --- a/qad/CMakeLists.txt +++ b/qad/CMakeLists.txt @@ -73,21 +73,21 @@ macro(qad_install _TARGET _H_FILES _QM_FILES) if(NOT "x${_H_FILES}" STREQUAL "x") install(FILES ${_H_FILES} DESTINATION ${MINGW_INCLUDE}/qad) endif() - qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_LIB}) + qt_install(TARGETS ${_TARGET} ARCHIVE DESTINATION ${MINGW_LIB}) qt_install(TARGETS ${_TARGET} RUNTIME DESTINATION ${MINGW_BIN}) qt_install(TARGETS ${_TARGET} RUNTIME DESTINATION QtBin) else() if(NOT "x${_H_FILES}" STREQUAL "x") install(FILES ${_H_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qad) endif() - qt_install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + qt_install(TARGETS ${_TARGET} ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() if(NOT "x${_QM_FILES}" STREQUAL "x") qt_install(LANG ${_QM_FILES} DESTINATION QtLang) endif() else() qt_install(TARGETS ${_TARGET} RUNTIME DESTINATION bin) - qt_install(TARGETS ${_TARGET} DESTINATION lib) + qt_install(TARGETS ${_TARGET} ARCHIVE DESTINATION lib) if(NOT "x${_H_FILES}" STREQUAL "x") install(FILES ${_H_FILES} DESTINATION include/qad) endif() diff --git a/qcd_utils/CMakeLists.txt b/qcd_utils/CMakeLists.txt index d5a130e..f9a271e 100644 --- a/qcd_utils/CMakeLists.txt +++ b/qcd_utils/CMakeLists.txt @@ -31,17 +31,17 @@ else() if(LIB) if(WIN32) install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) + qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION ${MINGW_LIB}) qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${MINGW_BIN}) qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION QtBin) else() install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION lib) + qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib) install(FILES ${out_HDR} DESTINATION include) message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"") endif() diff --git a/qglengine/CMakeLists.txt b/qglengine/CMakeLists.txt index 8729b45..070d008 100644 --- a/qglengine/CMakeLists.txt +++ b/qglengine/CMakeLists.txt @@ -45,17 +45,17 @@ else() if (LIB) if (WIN32) qt_install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}/qglengine) - qt_install(TARGETS qglengine_core DESTINATION ${MINGW_LIB}) + qt_install(TARGETS qglengine_core ARCHIVE DESTINATION ${MINGW_LIB}) qt_install(TARGETS qglengine_core RUNTIME DESTINATION ${MINGW_BIN}) 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 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + qt_install(TARGETS qglengine_core ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() message(STATUS "Install qglengine_core to system \"${CMAKE_INSTALL_PREFIX}\"") else() qt_install(TARGETS qglengine_core RUNTIME DESTINATION bin) - qt_install(TARGETS qglengine_core DESTINATION lib) + qt_install(TARGETS qglengine_core ARCHIVE DESTINATION lib) qt_install(FILES ${out_HDR} DESTINATION include/qglengine) message(STATUS "Install qglengine_core to local \"bin\", \"lib\" and \"include\"") endif() diff --git a/qglview/CMakeLists.txt b/qglview/CMakeLists.txt index b420122..bab0769 100644 --- a/qglview/CMakeLists.txt +++ b/qglview/CMakeLists.txt @@ -32,17 +32,17 @@ else() if (LIB) if (WIN32) qt_install(FILES ${H} DESTINATION ${MINGW_INCLUDE}/qad) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) + qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION ${MINGW_LIB}) qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${MINGW_BIN}) qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION QtBin) else() qt_install(FILES ${H} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qad) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION lib) + qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib) qt_install(FILES ${H} DESTINATION include/qad) message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"") endif()