git-svn-id: svn://db.shs.com.ru/libs@865 a8b55f48-bf90-11e4-a774-851b48703e85

This commit is contained in:
2020-03-19 10:42:24 +00:00
parent dcbfcbc7cd
commit 27854e9f3f
9 changed files with 54 additions and 17 deletions

View File

@@ -22,8 +22,12 @@ macro(sdk_install _DIR _TARGET _H_FILES _QM_FILES)
if(NOT "x${_H_FILES}" STREQUAL "x") if(NOT "x${_H_FILES}" STREQUAL "x")
install(FILES ${_H_FILES} DESTINATION include/${_DIR}) install(FILES ${_H_FILES} DESTINATION include/${_DIR})
endif() endif()
qt_install(TARGETS ${_TARGET} RUNTIME DESTINATION bin) if(WIN32)
qt_install(TARGETS ${_TARGET} ARCHIVE DESTINATION lib) qt_install(TARGETS ${_TARGET} RUNTIME DESTINATION bin)
qt_install(TARGETS ${_TARGET} ARCHIVE DESTINATION lib)
else()
qt_install(TARGETS ${_TARGET} DESTINATION bin/lib)
endif()
if(NOT "x${_QM_FILES}" STREQUAL "x") if(NOT "x${_QM_FILES}" STREQUAL "x")
qt_install(LANG ${_QM_FILES} DESTINATION lang) qt_install(LANG ${_QM_FILES} DESTINATION lang)
endif() endif()

View File

@@ -78,8 +78,12 @@ if(LIB)
endif() endif()
#message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") #message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
else() else()
install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) if(WIN32)
install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib) install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib)
else()
install(TARGETS ${PROJECT_NAME} DESTINATION bin/lib)
endif()
install(FILES ${HDRS_UTILS} DESTINATION include) install(FILES ${HDRS_UTILS} DESTINATION include)
#message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") #message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
endif() endif()

View File

@@ -40,8 +40,12 @@ else()
endif() endif()
message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
else() else()
qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) if(WIN32)
qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib) 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)
endif()
install(FILES ${out_HDR} DESTINATION include/pip) install(FILES ${out_HDR} DESTINATION include/pip)
message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"") message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")
endif() endif()

View File

@@ -64,8 +64,12 @@ else()
endif() endif()
message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
else() else()
qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) if(WIN32)
qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib) 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)
endif()
install(FILES ${out_HDR} DESTINATION include/pip) install(FILES ${out_HDR} DESTINATION include/pip)
message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"") message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")
endif() endif()

View File

@@ -86,8 +86,12 @@ macro(qad_install _TARGET _H_FILES _QM_FILES)
qt_install(LANG ${_QM_FILES} DESTINATION QtLang) qt_install(LANG ${_QM_FILES} DESTINATION QtLang)
endif() endif()
else() else()
qt_install(TARGETS ${_TARGET} RUNTIME DESTINATION bin) if(WIN32)
qt_install(TARGETS ${_TARGET} ARCHIVE DESTINATION lib) qt_install(TARGETS ${_TARGET} RUNTIME DESTINATION bin)
qt_install(TARGETS ${_TARGET} ARCHIVE DESTINATION lib)
else()
qt_install(TARGETS ${_TARGET} DESTINATION bin/lib)
endif()
if(NOT "x${_H_FILES}" STREQUAL "x") if(NOT "x${_H_FILES}" STREQUAL "x")
install(FILES ${_H_FILES} DESTINATION include/qad) install(FILES ${_H_FILES} DESTINATION include/qad)
endif() endif()

View File

@@ -40,8 +40,12 @@ else()
endif() endif()
message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
else() else()
qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) if(WIN32)
qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib) 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)
endif()
install(FILES ${out_HDR} DESTINATION include) install(FILES ${out_HDR} DESTINATION include)
message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"") message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")
endif() endif()

View File

@@ -54,8 +54,12 @@ else()
endif() endif()
message(STATUS "Install qglengine_core to system \"${CMAKE_INSTALL_PREFIX}\"") message(STATUS "Install qglengine_core to system \"${CMAKE_INSTALL_PREFIX}\"")
else() else()
qt_install(TARGETS qglengine_core RUNTIME DESTINATION bin) if(WIN32)
qt_install(TARGETS qglengine_core ARCHIVE DESTINATION lib) qt_install(TARGETS qglengine_core RUNTIME DESTINATION bin)
qt_install(TARGETS qglengine_core ARCHIVE DESTINATION lib)
else()
qt_install(TARGETS qglengine_core DESTINATION bin/lib)
endif()
qt_install(FILES ${out_HDR} DESTINATION include/qglengine) qt_install(FILES ${out_HDR} DESTINATION include/qglengine)
message(STATUS "Install qglengine_core to local \"bin\", \"lib\" and \"include\"") message(STATUS "Install qglengine_core to local \"bin\", \"lib\" and \"include\"")
endif() endif()

View File

@@ -28,7 +28,12 @@ else()
endif() endif()
message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
else() else()
qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) if(WIN32)
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)
endif()
qt_install(TARGETS ${PROJECT_NAME} DESTINATION lib) qt_install(TARGETS ${PROJECT_NAME} DESTINATION lib)
qt_install(FILES ${H} DESTINATION include/qglengine) qt_install(FILES ${H} DESTINATION include/qglengine)
message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"") message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")

View File

@@ -41,8 +41,12 @@ else()
endif() endif()
message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
else() else()
qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) if(WIN32)
qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib) 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)
endif()
qt_install(FILES ${H} DESTINATION include/qad) qt_install(FILES ${H} DESTINATION include/qad)
message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"") message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")
endif() endif()