From 0aded0bbeaa5afdbd83a47a295d40c048b01925b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Tue, 21 Apr 2020 11:51:52 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@958 a8b55f48-bf90-11e4-a774-851b48703e85 --- qcd_utils/pult/CMakeLists.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/qcd_utils/pult/CMakeLists.txt b/qcd_utils/pult/CMakeLists.txt index bd7a7dc..755aff8 100644 --- a/qcd_utils/pult/CMakeLists.txt +++ b/qcd_utils/pult/CMakeLists.txt @@ -1,17 +1,17 @@ project(cd_pult) -set_version(${PROJECT_NAME}5 +set_version(${PROJECT_NAME} MAJOR ${_QCD_MAJOR} MINOR ${_QCD_MINOR} REVISION ${_QCD_REVISION} BUILD ${BUILD_NUMBER} SUFFIX ${_QCD_SUFFIX}) find_qt(${QtVersions} Core Gui OpenGL) -set_deploy_property(${PROJECT_NAME}5 +set_deploy_property(${PROJECT_NAME} LABEL ${PROJECT_NAME} FULLNAME "${_QCD_DOMAIN}.${PROJECT_NAME}" COMPANY ${_QCD_COMPANY} INFO "CD Pult") -make_rc(${PROJECT_NAME}5 out_RC) +make_rc(${PROJECT_NAME} out_RC) qt_sources(SRC) qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM) qt_add_executable(${PROJECT_NAME} WIN32 out_CPP ${out_RC}) @@ -33,4 +33,8 @@ else() qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin) #message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") endif() -deploy_target(${PROJECT_NAME}5 VERBOSE DEPLOY_DIR ${CMAKE_CURRENT_BINARY_DIR} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../release) +if (Qt5_FOUND) + import_version(${PROJECT_NAME}5 ${PROJECT_NAME}) + import_deploy_properties(${PROJECT_NAME}5 ${PROJECT_NAME}) + deploy_target(${PROJECT_NAME}5 VERBOSE DEPLOY_DIR ${CMAKE_CURRENT_BINARY_DIR} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../release) +endif()