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

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

Browse Source
This commit is contained in:
Пелипенко Иван
2017-10-13 13:51:25 +00:00
parent 9a88a11651
commit 52f492f0d6
9 changed files with 141 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SDKMacros.cmake
View File

@@ -1,14 +1,15 @@
macro(sdk_install _DIR _TARGET _H_FILES) macro(sdk_install _DIR _TARGET _H_FILES _QM_FILES)
if(LIB) if(LIB)
if(WIN32) if(WIN32)
if(NOT _H_FILES STREQUAL "") if(NOT "x${_H_FILES}" STREQUAL "x")
#message("HFILES ${_H_FILES}") #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 _H_FILES STREQUAL "") if (NOT _H_FILES STREQUAL "")
install(FILES ${_H_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${_DIR}) install(FILES ${_H_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${_DIR})

5
piqt/CMakeLists.txt
View File

@@ -22,12 +22,15 @@ qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets)
message(STATUS "Building ${PROJECT_NAME}") message(STATUS "Building ${PROJECT_NAME}")
if(LIBPROJECT) if(LIBPROJECT)
include(SDKMacros) include(SDKMacros)
sdk_install("pip" "${PROJECT_NAME}" "${out_HDR}") sdk_install("pip" "${PROJECT_NAME}" "${out_HDR}" "${out_QM}")
else() else()
if(LIB) if(LIB)
if(WIN32) if(WIN32)
set(CMAKE_INSTALL_PREFIX ${MINGW_DIR}) set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}/pip) install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}/pip)
if(NOT "x${out_QM}" STREQUAL "x")
qt_install(FILES ${out_QM} DESTINATION QtLang)
endif()
qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin) qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin)

2
piqt_utils/CMakeLists.txt
View File

@@ -44,7 +44,7 @@ if (NOT DEFINED ENV{QNX_HOST})
endif() endif()
if(LIBPROJECT) if(LIBPROJECT)
sdk_install("pip" "${PROJECT_NAME}" "${out_HDR}") sdk_install("pip" "${PROJECT_NAME}" "${out_HDR}" "${out_QM}")
else() else()
if(LIB) if(LIB)
if(WIN32) if(WIN32)

14
qad/CMakeLists.txt
View File

@@ -39,19 +39,21 @@ endif()
set(CMAKES "FindQAD.cmake" "QtWraps.cmake") set(CMAKES "FindQAD.cmake" "QtWraps.cmake")
install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules) install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules)
macro(qad_install _TARGET _H_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}") sdk_install("qad" "${_TARGET}" "${_H_FILES}" "${_QM_FILES}")
else() else()
if (LIB) if (LIB)
if (WIN32) if (WIN32)
if (NOT _H_FILES STREQUAL "") if(NOT "x${_H_FILES}" STREQUAL "x")
#message("HFILES ${_H_FILES}") #message("HFILES ${_H_FILES}")
install(FILES ${_H_FILES} DESTINATION ${MINGW_INCLUDE}/qad) 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 _H_FILES STREQUAL "") if(NOT _H_FILES STREQUAL "")
install(FILES ${_H_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qad) install(FILES ${_H_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qad)
@@ -84,10 +86,10 @@ macro(qad_project NAME _MODULES _LIBS)
set(PROJ_NAME qad_${NAME}) set(PROJ_NAME qad_${NAME})
find_qt(${QtVersions} Core ${_MODULES}) find_qt(${QtVersions} Core ${_MODULES})
qt_sources(SRC) qt_sources(SRC)
qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM) qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS ${PROJ_NAME}_QM)
qt_add_library(${PROJ_NAME} SHARED out_CPP) qt_add_library(${PROJ_NAME} SHARED out_CPP)
qt_target_link_libraries(${PROJ_NAME} ${_LIBS}) qt_target_link_libraries(${PROJ_NAME} ${_LIBS})
qad_install(${PROJ_NAME} "${out_HDR}") qad_install(${PROJ_NAME} "${out_HDR}" ${PROJ_NAME}_QM)
message(STATUS "Building ${PROJ_NAME}") message(STATUS "Building ${PROJ_NAME}")
if (NOT DEFINED ANDROID_PLATFORM) if (NOT DEFINED ANDROID_PLATFORM)
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin") if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin")

25
qad/QtWraps.cmake
View File

@@ -433,11 +433,19 @@ endmacro()
# to corresponding Qt plugins directory # to corresponding Qt plugins directory
macro(qt_install) macro(qt_install)
set(_prev_inst) set(_prev_inst)
#message("command: ${ARGN}")
foreach(_v ${_QT_VERSIONS_}) foreach(_v ${_QT_VERSIONS_})
if (LOCAL_FOUND${_v}) if (LOCAL_FOUND${_v})
set(_INST_LIST) set(_INST_LIST)
set(_IS_TARGET 0) set(_IS_TARGET 0)
set(_IS_FILES 0)
set(_IS_DEST 0) set(_IS_DEST 0)
set(_IS_LANG 0)
foreach(_i ${ARGN})
if ("x${_i}" STREQUAL "xQtLang")
set(_IS_LANG 1)
endif()
endforeach()
foreach(_i ${ARGN}) foreach(_i ${ARGN})
if (_IS_TARGET) if (_IS_TARGET)
set(_IS_TARGET 0) set(_IS_TARGET 0)
@@ -446,6 +454,18 @@ macro(qt_install)
else() else()
set(_INST_LIST ${_INST_LIST} ${_i}) set(_INST_LIST ${_INST_LIST} ${_i})
endif() endif()
else()
if (_IS_FILES)
set(_IS_FILES 0)
if (_IS_LANG)
if (("x${${_i}_Qt${_v}}" STREQUAL "x") OR ("x${_i}" STREQUAL "xDESTINATION"))
return()
else()
set(_INST_LIST ${_INST_LIST} ${${_i}_Qt${_v}})
endif()
else()
set(_INST_LIST ${_INST_LIST} ${_i})
endif()
else() else()
if (_IS_DEST) if (_IS_DEST)
set(_IS_DEST 0) set(_IS_DEST 0)
@@ -469,6 +489,9 @@ macro(qt_install)
set(_INST_LIST ${_INST_LIST} ${_i}) set(_INST_LIST ${_INST_LIST} ${_i})
if ("x${_i}" STREQUAL "xTARGETS") if ("x${_i}" STREQUAL "xTARGETS")
set(_IS_TARGET 1) set(_IS_TARGET 1)
else()
if ("x${_i}" STREQUAL "xFILES")
set(_IS_FILES 1)
else() else()
if ("x${_i}" STREQUAL "xDESTINATION") if ("x${_i}" STREQUAL "xDESTINATION")
set(_IS_DEST 1) set(_IS_DEST 1)
@@ -476,6 +499,8 @@ macro(qt_install)
endif() endif()
endif() endif()
endif() endif()
endif()
endif()
endforeach() endforeach()
if (NOT ("x${_prev_inst}" STREQUAL "x${_INST_LIST}")) if (NOT ("x${_prev_inst}" STREQUAL "x${_INST_LIST}"))
#message("install: ${_INST_LIST}") #message("install: ${_INST_LIST}")

1
qad/blockview/qad_blockview.qrc
View File

@@ -1,6 +1,5 @@
<RCC> <RCC>
<qresource prefix="/"> <qresource prefix="/">
<file>lang/qad_blockview_ru.qm</file>
<file>../icons/draw-line.png</file> <file>../icons/draw-line.png</file>
<file>../icons/align-hor.png</file> <file>../icons/align-hor.png</file>
<file>../icons/align-ver.png</file> <file>../icons/align-ver.png</file>

1
qad/graphic/qad_graphic.qrc
View File

@@ -1,6 +1,5 @@
<RCC> <RCC>
<qresource prefix="/"> <qresource prefix="/">
<file>lang/qad_graphic_ru.qm</file>
<file>../icons/media-playback-pause.png</file> <file>../icons/media-playback-pause.png</file>
<file>../icons/dialog-close.png</file> <file>../icons/dialog-close.png</file>
<file>../icons/edit-clear.png</file> <file>../icons/edit-clear.png</file>

2
qcd_utils/CMakeLists.txt
View File

@@ -21,7 +21,7 @@ qt_add_library(${PROJECT_NAME} SHARED out_CPP)
qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets cd_utils piqt) qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets cd_utils piqt)
message(STATUS "Building ${PROJECT_NAME}") message(STATUS "Building ${PROJECT_NAME}")
if(LIBPROJECT) if(LIBPROJECT)
sdk_install("" "${PROJECT_NAME}" "${out_HDR}") sdk_install("" "${PROJECT_NAME}" "${out_HDR}" "${out_QM}")
else() else()
if(LIB) if(LIB)
if(WIN32) if(WIN32)

2
qglview/CMakeLists.txt
View File

@@ -25,7 +25,7 @@ qt_add_library(${PROJECT_NAME} SHARED out_CPP)
qt_target_link_libraries(${PROJECT_NAME} qad_utils qad_widgets ${OPENGL_LIBRARIES}) qt_target_link_libraries(${PROJECT_NAME} qad_utils qad_widgets ${OPENGL_LIBRARIES})
message(STATUS "Building ${PROJECT_NAME}") message(STATUS "Building ${PROJECT_NAME}")
if (LIBPROJECT) if (LIBPROJECT)
sdk_install("qad" "${PROJECT_NAME}" "${out_HDR}") sdk_install("qad" "${PROJECT_NAME}" "${out_HDR}" "${out_QM}")
else() else()
if (LIB) if (LIB)
if (WIN32) if (WIN32)