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

This commit is contained in:
2020-03-18 12:30:46 +00:00
parent be9ca15ba3
commit 79db045ee1
6 changed files with 18 additions and 18 deletions

View File

@@ -31,17 +31,17 @@ else()
if(NOT "x${out_QM}" STREQUAL "x") if(NOT "x${out_QM}" STREQUAL "x")
qt_install(FILES ${out_QM} DESTINATION QtLang) qt_install(FILES ${out_QM} DESTINATION QtLang)
endif() 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 ${MINGW_BIN})
qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION QtBin) qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION QtBin)
else() else()
install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip) 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() 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) 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) 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

@@ -55,17 +55,17 @@ else()
if(LIB) if(LIB)
if(WIN32) if(WIN32)
install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}/pip) 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 ${MINGW_BIN})
qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION QtBin) qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION QtBin)
else() else()
install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip) 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() 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) 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) 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

@@ -73,21 +73,21 @@ macro(qad_install _TARGET _H_FILES _QM_FILES)
if(NOT "x${_H_FILES}" STREQUAL "x") if(NOT "x${_H_FILES}" STREQUAL "x")
install(FILES ${_H_FILES} DESTINATION ${MINGW_INCLUDE}/qad) install(FILES ${_H_FILES} DESTINATION ${MINGW_INCLUDE}/qad)
endif() 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 ${MINGW_BIN})
qt_install(TARGETS ${_TARGET} RUNTIME DESTINATION QtBin) qt_install(TARGETS ${_TARGET} RUNTIME DESTINATION QtBin)
else() else()
if(NOT "x${_H_FILES}" STREQUAL "x") if(NOT "x${_H_FILES}" STREQUAL "x")
install(FILES ${_H_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qad) install(FILES ${_H_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qad)
endif() endif()
qt_install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) qt_install(TARGETS ${_TARGET} ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
endif() endif()
if(NOT "x${_QM_FILES}" STREQUAL "x") if(NOT "x${_QM_FILES}" STREQUAL "x")
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) 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") 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

@@ -31,17 +31,17 @@ else()
if(LIB) if(LIB)
if(WIN32) if(WIN32)
install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}) 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 ${MINGW_BIN})
qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION QtBin) qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION QtBin)
else() else()
install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) 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() 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) 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) 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

@@ -45,17 +45,17 @@ else()
if (LIB) if (LIB)
if (WIN32) if (WIN32)
qt_install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}/qglengine) 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 ${MINGW_BIN})
qt_install(TARGETS qglengine_core RUNTIME DESTINATION QtBin) qt_install(TARGETS qglengine_core RUNTIME DESTINATION QtBin)
else() else()
qt_install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qglengine) 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() 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) 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) 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

@@ -32,17 +32,17 @@ else()
if (LIB) if (LIB)
if (WIN32) if (WIN32)
qt_install(FILES ${H} DESTINATION ${MINGW_INCLUDE}/qad) 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 ${MINGW_BIN})
qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION QtBin) qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION QtBin)
else() else()
qt_install(FILES ${H} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qad) 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() 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) 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) 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()