From 0e28c059ccb88ad6c2ad14471fd5d053e2b21d7a 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?= <andrey@signalmodelling.ru>
Date: Tue, 16 May 2017 12:14:00 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@210
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 piqt/CMakeLists.txt | 2 +-
 qad/CMakeLists.txt  | 3 +--
 qad/FindQAD.cmake   | 4 +---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/piqt/CMakeLists.txt b/piqt/CMakeLists.txt
index 6ec9bac..aa5d884 100644
--- a/piqt/CMakeLists.txt
+++ b/piqt/CMakeLists.txt
@@ -8,8 +8,8 @@ if(NOT LIBPROJECT)
 	if(DEBUG)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
 	endif()
-	include(QtProject)
 endif()
+include(QtProject)
 find_package(QAD REQUIRED)
 include_directories(${PIP_INCLUDES} ${QAD_INCLUDES})
 set(LIBS ${PIP_LIBRARY} ${QAD_UTILS_LIBRARY})
diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt
index 37196e5..8b9b6f4 100644
--- a/qad/CMakeLists.txt
+++ b/qad/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(qad)
 cmake_minimum_required(VERSION 2.6)
-include(./QtProject.cmake)
+include(QtProject.cmake)
 if (LIBPROJECT)
 	include(../SDKMacros.cmake)
 else()
@@ -10,7 +10,6 @@ else()
 	if (DEBUG)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
 	endif ()
-	set(QAD_STANDALONE 1)
 endif()
 find_package(OpenGL REQUIRED)
 if (MINGW)
diff --git a/qad/FindQAD.cmake b/qad/FindQAD.cmake
index 24f36b6..1ffb48b 100644
--- a/qad/FindQAD.cmake
+++ b/qad/FindQAD.cmake
@@ -1,6 +1,4 @@
-if(LIBPROJECT OR QAD_STANDALONE)
-	include(./QtProject.cmake)
-else()
+if(NOT LIBPROJECT)
 	include(QtProject)
 endif()
 set(_SEARCH_DIR)