From a7402afb52bd45699ecd64750071d55c125f4ef2 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: Wed, 30 Nov 2016 16:18:11 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@142 a8b55f48-bf90-11e4-a774-851b48703e85 --- piqt_utils/CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/piqt_utils/CMakeLists.txt b/piqt_utils/CMakeLists.txt index ba91c41..84353cb 100644 --- a/piqt_utils/CMakeLists.txt +++ b/piqt_utils/CMakeLists.txt @@ -2,7 +2,7 @@ project(piqt_utils) cmake_minimum_required(VERSION 2.6) find_package(Qt4 REQUIRED) if (LIBPROJECT) - set(PIP_CMG pip_cmg) + set(PIP_CMG ${CMAKE_CURRENT_BINARY_DIR}/../pip/utils/code_model_generator/pip_cmg.exe) include(${CMAKE_CURRENT_SOURCE_DIR}/../pip/PIPMacros2.cmake) else () find_package(PIP REQUIRED) @@ -18,17 +18,18 @@ if (DEBUG) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3") endif () set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PIP_LIBRARY} qad_widgets qad_utils qad_blockview) -pip_code_model(CCM "../pip/src/io/piiodevice.h" OPTIONS "-I${CMAKE_CURRENT_SOURCE_DIR}/../pip/src/io/" "-I${CMAKE_CURRENT_SOURCE_DIR}/../pip/src/core/" "-DPIP_EXPORT" "-Es") +pip_code_model(CCM "../pip/src/io/piiodevice.h" OPTIONS "-DPIP_EXPORT" "-Es") message(STATUS "pip_code_model for iodevice = ${CCM}") -file(GLOB CPPS_UTILS "piqt_*.cpp" ${CCM}) +message(STATUS "pip_INCLUDES = ${PIP_INCLUDES}") +file(GLOB CPPS_UTILS "piqt_*.cpp") file(GLOB HDRS_UTILS "piqt_*.h") file(GLOB UIS_UTILS "piqt_*.ui") qt4_wrap_cpp(CMOCS_UTILS ${HDRS_UTILS} OPTIONS -nw) qt4_wrap_ui(CUIS_UTILS ${UIS_UTILS}) if (DEFINED ENV{QNX_HOST}) - add_library(${PROJECT_NAME} STATIC ${CPPS_UTILS} ${CMOCS_UTILS} ${CUIS_UTILS}) + add_library(${PROJECT_NAME} STATIC ${CPPS_UTILS} ${CMOCS_UTILS} ${CUIS_UTILS} ${CCM}) else () - add_library(${PROJECT_NAME} SHARED ${CPPS_UTILS} ${CMOCS_UTILS} ${CUIS_UTILS}) + add_library(${PROJECT_NAME} SHARED ${CPPS_UTILS} ${CMOCS_UTILS} ${CUIS_UTILS} ${CCM}) endif () target_link_libraries(${PROJECT_NAME} ${LIBS}) if (NOT DEFINED ENV{QNX_HOST})