From 13831709944bc0b892fcbd9dc2995a07bd53e5d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Tue, 16 May 2017 12:34:15 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@212 a8b55f48-bf90-11e4-a774-851b48703e85 --- piqt_utils/CMakeLists.txt | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/piqt_utils/CMakeLists.txt b/piqt_utils/CMakeLists.txt index c7f63d0..a7be75a 100644 --- a/piqt_utils/CMakeLists.txt +++ b/piqt_utils/CMakeLists.txt @@ -36,24 +36,23 @@ if (LIBPROJECT) endif() if (NOT DEFINED ENV{QNX_HOST}) - set(CPPS "pidumper.cpp" "pidumper_main.cpp") - set(MOCS "pidumper.h") - set(UIS "pidumper.ui") file(GLOB RES "*.qrc") - qt4_wrap_cpp(CMOCS ${MOCS} OPTIONS -nw) - qt4_wrap_ui(CUIS ${UIS}) qt4_add_resources(RESS ${RES}) - add_executable(pidumper ${CPPS} ${CMOCS} ${CUIS} ${RESS}) + + set(PIDUMPER_CPPS "pidumper.cpp" "pidumper_main.cpp") + set(PIDUMPER_MOCS "pidumper.h") + set(PIDUMPER_UIS "pidumper.ui") + qt4_wrap_cpp(PIDUMPER_CMOCS ${PIDUMPER_MOCS} OPTIONS -nw) + qt4_wrap_ui(PIDUMPER_CUIS ${PIDUMPER_UIS}) + add_executable(pidumper ${PIDUMPER_CPPS} ${PIDUMPER_CMOCS} ${PIDUMPER_CUIS} ${RESS}) target_link_libraries(pidumper ${LIBS} ${PROJECT_NAME}) - set(ICPPS "piintrospector.cpp" "piintrospector_main.cpp") - set(IMOCS "piintrospector.h") - set(IUIS "piintrospector.ui") - file(GLOB IRES "*.qrc") - qt4_wrap_cpp(ICMOCS ${IMOCS} OPTIONS -nw) - qt4_wrap_ui(ICUIS ${IUIS}) - qt4_add_resources(IRESS ${IRES}) - add_executable(piintrospector ${ICPPS} ${ICMOCS} ${ICUIS} ${IRESS}) + set(PIINTROSPECTOR_CPPS "piintrospector.cpp" "piintrospector_main.cpp") + set(PIINTROSPECTOR_MOCS "piintrospector.h") + set(PIINTROSPECTOR_UIS "piintrospector.ui") + qt4_wrap_cpp(PIINTROSPECTOR_CMOCS ${PIINTROSPECTOR_MOCS} OPTIONS -nw) + qt4_wrap_ui(PIINTROSPECTOR_CUIS ${PIINTROSPECTOR_UIS}) + add_executable(piintrospector ${PIINTROSPECTOR_CPPS} ${PIINTROSPECTOR_CMOCS} ${PIINTROSPECTOR_CUIS} ${RESS}) target_link_libraries(piintrospector ${LIBS} ${PROJECT_NAME}) add_executable(piconnectionedit "piconnedit_main.cpp" ${RESS})