From 147c3e1bfd61ef210ead24c4f5c29f021d7ca2b8 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: Fri, 20 Mar 2020 09:34:44 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@871 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 | 2 +- qcd_utils/CMakeLists.txt | 2 +- qglview/CMakeLists.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/SDKMacros.cmake b/SDKMacros.cmake index 4237e58..77db2e1 100644 --- a/SDKMacros.cmake +++ b/SDKMacros.cmake @@ -26,7 +26,7 @@ macro(sdk_install _DIR _TARGET _H_FILES _QM_FILES) qt_install(TARGETS ${_TARGET} RUNTIME DESTINATION bin) qt_install(TARGETS ${_TARGET} ARCHIVE DESTINATION lib) else() - qt_install(TARGETS ${_TARGET} DESTINATION bin/lib) + qt_install(TARGETS ${_TARGET} DESTINATION lib) endif() if(NOT "x${_QM_FILES}" STREQUAL "x") qt_install(LANG ${_QM_FILES} DESTINATION lang) diff --git a/cd_utils/CMakeLists.txt b/cd_utils/CMakeLists.txt index 6d2a3b3..6b93f18 100644 --- a/cd_utils/CMakeLists.txt +++ b/cd_utils/CMakeLists.txt @@ -82,7 +82,7 @@ else() install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib) else() - install(TARGETS ${PROJECT_NAME} DESTINATION bin/lib) + install(TARGETS ${PROJECT_NAME} DESTINATION lib) endif() install(FILES ${HDRS_UTILS} DESTINATION include) #message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") diff --git a/piqt/CMakeLists.txt b/piqt/CMakeLists.txt index b50587b..4680cd0 100644 --- a/piqt/CMakeLists.txt +++ b/piqt/CMakeLists.txt @@ -44,7 +44,7 @@ else() qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib) else() - qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin/lib) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION lib) endif() 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 4a46907..218be4c 100644 --- a/piqt_utils/CMakeLists.txt +++ b/piqt_utils/CMakeLists.txt @@ -68,7 +68,7 @@ else() qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib) else() - qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin/lib) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION lib) endif() 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 fd846c6..252336e 100644 --- a/qad/CMakeLists.txt +++ b/qad/CMakeLists.txt @@ -92,7 +92,7 @@ macro(qad_install _TARGET _H_FILES _QM_FILES) qt_install(TARGETS ${_TARGET} RUNTIME DESTINATION bin) qt_install(TARGETS ${_TARGET} ARCHIVE DESTINATION lib) else() - qt_install(TARGETS ${_TARGET} DESTINATION bin/lib) + qt_install(TARGETS ${_TARGET} DESTINATION lib) endif() 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 971b170..fc29e2e 100644 --- a/qcd_utils/CMakeLists.txt +++ b/qcd_utils/CMakeLists.txt @@ -44,7 +44,7 @@ else() qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib) else() - qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin/lib) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION lib) endif() install(FILES ${out_HDR} DESTINATION include) message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"") diff --git a/qglview/CMakeLists.txt b/qglview/CMakeLists.txt index d429bb1..31ed242 100644 --- a/qglview/CMakeLists.txt +++ b/qglview/CMakeLists.txt @@ -45,7 +45,7 @@ else() qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib) else() - qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin/lib) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION lib) endif() qt_install(FILES ${H} DESTINATION include/qad) message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")