From a37bb311b560d6a0ca9cdaf4f8b788d319709cca 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:53:00 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@215 a8b55f48-bf90-11e4-a774-851b48703e85 --- piqt_utils/CMakeLists.txt | 1 + qad/QtProject.cmake | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/piqt_utils/CMakeLists.txt b/piqt_utils/CMakeLists.txt index 11fa927..e9fe159 100644 --- a/piqt_utils/CMakeLists.txt +++ b/piqt_utils/CMakeLists.txt @@ -12,6 +12,7 @@ else() endif() find_package(PIP REQUIRED) endif() +find_package(Qt4 REQUIRED) find_package(QAD REQUIRED) message(STATUS "Building ${PROJECT_NAME}") include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES} ${PIP_INCLUDES} ${QAD_INCLUDES}) diff --git a/qad/QtProject.cmake b/qad/QtProject.cmake index 2fb0230..dd3c5c1 100644 --- a/qad/QtProject.cmake +++ b/qad/QtProject.cmake @@ -1,7 +1,3 @@ -set(QTVERSION 4) -find_package(Qt${QTVERSION} REQUIRED) -include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES}) - macro(qt_project NAME _TYPE _LIBS _H_OUT _CPP_OUT) project(${NAME}) find_package(Qt4 REQUIRED)