From 90e5f07fdc17242e6afe3bba500754695c246d1a 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 14:19:51 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@140 a8b55f48-bf90-11e4-a774-851b48703e85 --- piqt_utils/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/piqt_utils/CMakeLists.txt b/piqt_utils/CMakeLists.txt index b6428eb..70c083e 100644 --- a/piqt_utils/CMakeLists.txt +++ b/piqt_utils/CMakeLists.txt @@ -2,7 +2,8 @@ project(piqt_utils) cmake_minimum_required(VERSION 2.6) find_package(Qt4 REQUIRED) if (LIBPROJECT) - include(${CMAKE_CURRENT_SOURCE_DIR}/../pip/PIPMacros.cmake) + set(PIP_CMG pip_cmg) + include(${CMAKE_CURRENT_SOURCE_DIR}/../pip/PIPMacros2.cmake) else () find_package(PIP REQUIRED) endif () @@ -17,7 +18,7 @@ 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("../pip/src/io/piiodevice.h" CCM 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 "-I${CMAKE_CURRENT_SOURCE_DIR}/../pip/src/io/" "-I${CMAKE_CURRENT_SOURCE_DIR}/../pip/src/core/" "-DPIP_EXPORT" "-Es") file(GLOB CPPS_UTILS "piqt_*.cpp" ${CCM}) file(GLOB HDRS_UTILS "piqt_*.h") file(GLOB UIS_UTILS "piqt_*.ui")