From 1bddcd735145acae220566294308ded5cbd4a3be 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: Thu, 5 Mar 2020 09:15:13 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@736 a8b55f48-bf90-11e4-a774-851b48703e85 --- SDKMacros.cmake | 6 +++--- cd_utils/CMakeLists.txt | 4 ++-- kx_utils/CMakeLists.txt | 4 ++-- piqt/CMakeLists.txt | 6 +++--- piqt_utils/CMakeLists.txt | 6 +++--- qad/CMakeLists.txt | 6 +++--- qcd_utils/CMakeLists.txt | 6 +++--- qglengine/CMakeLists.txt | 6 +++--- qglengine/widgets/CMakeLists.txt | 6 +++--- qglview/CMakeLists.txt | 6 +++--- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/SDKMacros.cmake b/SDKMacros.cmake index cf38277..d0a1b75 100644 --- a/SDKMacros.cmake +++ b/SDKMacros.cmake @@ -7,8 +7,8 @@ macro(sdk_install _DIR _TARGET _H_FILES _QM_FILES) install(FILES ${_H_FILES} DESTINATION ${MINGW_INCLUDE}/${_DIR}) endif() qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_LIB}) - qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_BIN}) - qt_install(TARGETS ${_TARGET} DESTINATION QtBin) + 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/${_DIR}) @@ -22,7 +22,7 @@ macro(sdk_install _DIR _TARGET _H_FILES _QM_FILES) if(NOT "x${_H_FILES}" STREQUAL "x") install(FILES ${_H_FILES} DESTINATION include/${_DIR}) endif() - qt_install(TARGETS ${_TARGET} DESTINATION bin) + 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) diff --git a/cd_utils/CMakeLists.txt b/cd_utils/CMakeLists.txt index c1c7f88..306845a 100644 --- a/cd_utils/CMakeLists.txt +++ b/cd_utils/CMakeLists.txt @@ -58,14 +58,14 @@ if(LIB) if(WIN32) install(FILES ${HDRS_UTILS} DESTINATION ${MINGW_INCLUDE}) install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) - install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) + install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${MINGW_BIN}) else() install(FILES ${HDRS_UTILS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() #message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() - install(TARGETS ${PROJECT_NAME} DESTINATION bin) + install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) install(TARGETS ${PROJECT_NAME} DESTINATION lib) install(FILES ${HDRS_UTILS} DESTINATION include) #message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") diff --git a/kx_utils/CMakeLists.txt b/kx_utils/CMakeLists.txt index 16b4214..584053f 100644 --- a/kx_utils/CMakeLists.txt +++ b/kx_utils/CMakeLists.txt @@ -50,7 +50,7 @@ if (LIB) set(CMAKE_INSTALL_PREFIX ${MINGW_DIR}) install(FILES ${HDRS_UTILS} DESTINATION ${MINGW_INCLUDE}) install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) - install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) + install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${MINGW_BIN}) else() if (DEFINED ANDROID_PLATFORM) set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr) @@ -62,7 +62,7 @@ if (LIB) endif() message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() - install(TARGETS ${PROJECT_NAME} DESTINATION bin) + install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) install(TARGETS ${PROJECT_NAME} DESTINATION lib) install(FILES ${HDRS_UTILS} DESTINATION include) message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"") diff --git a/piqt/CMakeLists.txt b/piqt/CMakeLists.txt index d04b4a9..d8cb37e 100644 --- a/piqt/CMakeLists.txt +++ b/piqt/CMakeLists.txt @@ -32,15 +32,15 @@ else() qt_install(FILES ${out_QM} DESTINATION QtLang) endif() qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin) + 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) endif() message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() - qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin) + qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) qt_install(TARGETS ${PROJECT_NAME} DESTINATION lib) install(FILES ${out_HDR} DESTINATION include/pip) message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"") diff --git a/piqt_utils/CMakeLists.txt b/piqt_utils/CMakeLists.txt index 57b1017..b777f38 100644 --- a/piqt_utils/CMakeLists.txt +++ b/piqt_utils/CMakeLists.txt @@ -56,15 +56,15 @@ else() if(WIN32) install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}/pip) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin) + 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) endif() message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() - qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin) + qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) qt_install(TARGETS ${PROJECT_NAME} DESTINATION lib) install(FILES ${out_HDR} DESTINATION include/pip) message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"") diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt index db7bf58..e2d3d8c 100644 --- a/qad/CMakeLists.txt +++ b/qad/CMakeLists.txt @@ -72,8 +72,8 @@ macro(qad_install _TARGET _H_FILES _QM_FILES) install(FILES ${_H_FILES} DESTINATION ${MINGW_INCLUDE}/${_DIR}) endif() qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_LIB}) - qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_BIN}) - qt_install(TARGETS ${_TARGET} DESTINATION QtBin) + 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) @@ -84,7 +84,7 @@ macro(qad_install _TARGET _H_FILES _QM_FILES) qt_install(FILES ${_QM_FILES} DESTINATION QtLang) endif() else() - qt_install(TARGETS ${_TARGET} DESTINATION bin) + qt_install(TARGETS ${_TARGET} RUNTIME DESTINATION bin) qt_install(TARGETS ${_TARGET} DESTINATION lib) if(NOT "x${_H_FILES}" STREQUAL "x") install(FILES ${_H_FILES} DESTINATION include/qad) diff --git a/qcd_utils/CMakeLists.txt b/qcd_utils/CMakeLists.txt index bd023bc..65a9232 100644 --- a/qcd_utils/CMakeLists.txt +++ b/qcd_utils/CMakeLists.txt @@ -32,15 +32,15 @@ else() if(WIN32) install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin) + 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) endif() message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() - qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin) + qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) qt_install(TARGETS ${PROJECT_NAME} DESTINATION lib) install(FILES ${out_HDR} DESTINATION include) message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"") diff --git a/qglengine/CMakeLists.txt b/qglengine/CMakeLists.txt index ff601d1..f026767 100644 --- a/qglengine/CMakeLists.txt +++ b/qglengine/CMakeLists.txt @@ -46,15 +46,15 @@ else() if (WIN32) qt_install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}/qglengine) qt_install(TARGETS qglengine_core DESTINATION ${MINGW_LIB}) - qt_install(TARGETS qglengine_core DESTINATION ${MINGW_BIN}) - qt_install(TARGETS qglengine_core DESTINATION QtBin) + 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) endif() message(STATUS "Install qglengine_core to system \"${CMAKE_INSTALL_PREFIX}\"") else() - qt_install(TARGETS qglengine_core DESTINATION bin) + qt_install(TARGETS qglengine_core RUNTIME DESTINATION bin) qt_install(TARGETS qglengine_core DESTINATION lib) qt_install(FILES ${out_HDR} DESTINATION include/qglengine) message(STATUS "Install qglengine_core to local \"bin\", \"lib\" and \"include\"") diff --git a/qglengine/widgets/CMakeLists.txt b/qglengine/widgets/CMakeLists.txt index 834d3d5..6fb2155 100644 --- a/qglengine/widgets/CMakeLists.txt +++ b/qglengine/widgets/CMakeLists.txt @@ -20,15 +20,15 @@ else() if (WIN32) qt_install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}/qglengine) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin) + 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/qglengine) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() - qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin) + qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) qt_install(TARGETS ${PROJECT_NAME} DESTINATION lib) qt_install(FILES ${H} DESTINATION include/qglengine) message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"") diff --git a/qglview/CMakeLists.txt b/qglview/CMakeLists.txt index 83a4247..ebd06bc 100644 --- a/qglview/CMakeLists.txt +++ b/qglview/CMakeLists.txt @@ -33,15 +33,15 @@ else() if (WIN32) qt_install(FILES ${H} DESTINATION ${MINGW_INCLUDE}/qad) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin) + 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) endif() message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() - qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin) + qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) qt_install(TARGETS ${PROJECT_NAME} DESTINATION lib) qt_install(FILES ${H} DESTINATION include/qad) message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")