SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add win_rc for qad

Browse Source 
git-svn-id: svn://db.shs.com.ru/libs@922 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
Бычков Андрей
2020-03-31 09:03:44 +00:00
parent 262284ed65
commit 7b67296990
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
qad/CMakeLists.txt
View File

@@ -155,7 +155,22 @@ 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) import_version(${PROJ_NAME} QAD)
if(NOT STATIC_LIB)
set_deploy_property(${PROJ_NAME} SHARED
LABEL ${PROJ_NAME}
FULLNAME "${_QAD_DOMAIN}.${PROJ_NAME}"
COMPANY ${_QAD_COMPANY}
INFO "QAD ${NAME} library")
else()
set_deploy_property(${PROJ_NAME} STATIC
LABEL ${PROJ_NAME}
FULLNAME "${_QAD_DOMAIN}.${PROJ_NAME}"
COMPANY ${_QAD_COMPANY}
INFO "QAD ${NAME} library")
endif()
make_rc(${PROJ_NAME} out_RC)
qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM ${out_RC})
qt_add_library(${PROJ_NAME} ${QAD_LIB_TYPE} out_CPP ${EXPORT_HEADER}) qt_add_library(${PROJ_NAME} ${QAD_LIB_TYPE} out_CPP ${EXPORT_HEADER})
if(NOT STATIC_LIB) if(NOT STATIC_LIB)
qt_target_compile_definitions(${PROJ_NAME} PRIVATE QAD_SHARED_DEFINE) qt_target_compile_definitions(${PROJ_NAME} PRIVATE QAD_SHARED_DEFINE)

6
qcd_utils/CMakeLists.txt
View File

@@ -21,7 +21,7 @@ if (NOT LIBPROJECT)
endif() endif()
include(DeployMacros) include(DeployMacros)
endif() endif()
set_version(${PROJECT_NAME}5 set_version(${PROJECT_NAME}
MAJOR ${_QCD_MAJOR} MAJOR ${_QCD_MAJOR}
MINOR ${_QCD_MINOR} MINOR ${_QCD_MINOR}
REVISION ${_QCD_REVISION} REVISION ${_QCD_REVISION}
@@ -34,12 +34,12 @@ set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE)
include_directories(${PIP_INCLUDES} ${QAD_INCLUDES}) include_directories(${PIP_INCLUDES} ${QAD_INCLUDES})
file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts") file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts")
find_qt(${QtVersions} Core Gui) find_qt(${QtVersions} Core Gui)
set_deploy_property(${PROJECT_NAME}5 SHARED set_deploy_property(${PROJECT_NAME} SHARED
LABEL ${PROJECT_NAME} LABEL ${PROJECT_NAME}
FULLNAME "${_QCD_DOMAIN}.${PROJECT_NAME}" FULLNAME "${_QCD_DOMAIN}.${PROJECT_NAME}"
COMPANY ${_QCD_COMPANY} COMPANY ${_QCD_COMPANY}
INFO "QCD library") INFO "QCD library")
make_rc(${PROJECT_NAME}5 out_RC) make_rc(${PROJECT_NAME} out_RC)
qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM) qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
qt_add_library(${PROJECT_NAME} SHARED out_CPP ${out_RC}) qt_add_library(${PROJECT_NAME} SHARED out_CPP ${out_RC})
qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets qad_graphic cd_utils piqt) qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets qad_graphic cd_utils piqt)