diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt index 80b25b3..98a9218 100644 --- a/qad/CMakeLists.txt +++ b/qad/CMakeLists.txt @@ -155,7 +155,22 @@ macro(qad_project NAME _MODULES _LIBS) set(PROJ_NAME qad_${NAME}) find_qt(${QtVersions} Core ${_MODULES}) 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}) if(NOT STATIC_LIB) qt_target_compile_definitions(${PROJ_NAME} PRIVATE QAD_SHARED_DEFINE) diff --git a/qcd_utils/CMakeLists.txt b/qcd_utils/CMakeLists.txt index 1a88c92..13da4cb 100644 --- a/qcd_utils/CMakeLists.txt +++ b/qcd_utils/CMakeLists.txt @@ -21,7 +21,7 @@ if (NOT LIBPROJECT) endif() include(DeployMacros) endif() -set_version(${PROJECT_NAME}5 +set_version(${PROJECT_NAME} MAJOR ${_QCD_MAJOR} MINOR ${_QCD_MINOR} REVISION ${_QCD_REVISION} @@ -34,12 +34,12 @@ set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE) include_directories(${PIP_INCLUDES} ${QAD_INCLUDES}) file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts") find_qt(${QtVersions} Core Gui) -set_deploy_property(${PROJECT_NAME}5 SHARED +set_deploy_property(${PROJECT_NAME} SHARED LABEL ${PROJECT_NAME} FULLNAME "${_QCD_DOMAIN}.${PROJECT_NAME}" COMPANY ${_QCD_COMPANY} 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_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)