SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Бычков Андрей
2020-03-05 08:17:27 +00:00
parent 6a61b9f62a
commit 730be4d865
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
SDKMacros.cmake
View File

@@ -3,29 +3,28 @@ macro(sdk_install _DIR _TARGET _H_FILES _QM_FILES)
if(LIB) if(LIB)
if(WIN32) if(WIN32)
if(NOT "x${_H_FILES}" STREQUAL "x") if(NOT "x${_H_FILES}" STREQUAL "x")
#message("HFILES ${_H_FILES}")
install(FILES ${_H_FILES} DESTINATION ${MINGW_INCLUDE}/${_DIR}) install(FILES ${_H_FILES} DESTINATION ${MINGW_INCLUDE}/${_DIR})
endif() endif()
qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_LIB}) qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_LIB})
qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_BIN}) qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_BIN})
qt_install(TARGETS ${_TARGET} DESTINATION QtBin) qt_install(TARGETS ${_TARGET} DESTINATION QtBin)
qt_install(FILES ${_QM_FILES} DESTINATION QtLang)
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/${_DIR}) install(FILES ${_H_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${_DIR})
endif() endif()
qt_install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) qt_install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
qt_install(FILES ${_QM_FILES} DESTINATION QtLang)
endif() endif()
#message(STATUS "Install ${_TARGET} to system \"${CMAKE_INSTALL_PREFIX}\"") if(NOT "x${_QM_FILES}" STREQUAL "x")
qt_install(FILES "${_QM_FILES}" DESTINATION QtLang)
endif()
else() else()
if(NOT "x${_H_FILES}" STREQUAL "x") if(NOT "x${_H_FILES}" STREQUAL "x")
#message("HFILES ${_H_FILES}")
install(FILES ${_H_FILES} DESTINATION include/${_DIR}) install(FILES ${_H_FILES} DESTINATION include/${_DIR})
endif() endif()
qt_install(TARGETS ${_TARGET} DESTINATION bin) qt_install(TARGETS ${_TARGET} DESTINATION bin)
qt_install(TARGETS ${_TARGET} DESTINATION lib) qt_install(TARGETS ${_TARGET} DESTINATION lib)
qt_install(FILES ${_QM_FILES} DESTINATION lang) if(NOT "x${_QM_FILES}" STREQUAL "x")
#message(STATUS "Install ${_TARGET} to local \"bin\"") qt_install(FILES "${_QM_FILES}" DESTINATION lang)
endif()
endif() endif()
endmacro() endmacro()

10
qad/CMakeLists.txt
View File

@@ -63,32 +63,35 @@ if (LIB)
endif() endif()
macro(qad_install _TARGET _H_FILES _QM_FILES) macro(qad_install _TARGET _H_FILES _QM_FILES)
#message("qad_install ${_TARGET} ${_QM_FILES}")
if (LIBPROJECT) if (LIBPROJECT)
sdk_install("qad" "${_TARGET}" "${_H_FILES}" "${_QM_FILES}") sdk_install("qad" "${_TARGET}" "${_H_FILES}" "${_QM_FILES}")
else() else()
if (LIB) if (LIB)
if (WIN32) if (WIN32)
if(NOT "x${_H_FILES}" STREQUAL "x") if(NOT "x${_H_FILES}" STREQUAL "x")
#message("HFILES ${_H_FILES}")
install(FILES ${_H_FILES} DESTINATION ${MINGW_INCLUDE}/${_DIR}) install(FILES ${_H_FILES} DESTINATION ${MINGW_INCLUDE}/${_DIR})
endif() endif()
qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_LIB}) qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_LIB})
qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_BIN}) qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_BIN})
qt_install(TARGETS ${_TARGET} DESTINATION QtBin) qt_install(TARGETS ${_TARGET} DESTINATION QtBin)
qt_install(FILES "${_QM_FILES}" DESTINATION QtLang)
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} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
endif() endif()
if(NOT "x${_QM_FILES}" STREQUAL "x")
qt_install(FILES "${_QM_FILES}" DESTINATION QtLang)
endif()
else() else()
qt_install(TARGETS ${_TARGET} DESTINATION bin) qt_install(TARGETS ${_TARGET} DESTINATION bin)
qt_install(TARGETS ${_TARGET} DESTINATION lib) qt_install(TARGETS ${_TARGET} 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()
if(NOT "x${_QM_FILES}" STREQUAL "x")
qt_install(FILES "${_QM_FILES}" DESTINATION lang)
endif()
endif() endif()
endif() endif()
endmacro() endmacro()
@@ -98,7 +101,6 @@ macro(qad_plugin NAME _MODULES _LIBS)
if(DESIGNER_PLUGINS) if(DESIGNER_PLUGINS)
set(PROJ_NAME qad_${NAME}_plugin) set(PROJ_NAME qad_${NAME}_plugin)
include_directories("..") include_directories("..")
#message(${_${NAME}_PLUGIN_LIBS})
add_definitions(-DQT_PLUGIN) add_definitions(-DQT_PLUGIN)
add_definitions(-DQT_NO_DEBUG) add_definitions(-DQT_NO_DEBUG)
add_definitions(-DQT_SHARED) add_definitions(-DQT_SHARED)