From 2d544595e27b58b4df3299e85016494499085469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= <peri4ko@yandex.ru>
Date: Sun, 8 Mar 2020 18:44:14 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@748
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 CMakeLists.txt    |  8 +++-----
 qad/FindQAD.cmake | 20 +++++++++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ace6188..7af4f4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,11 +17,9 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 set(LIBPROJECT 1)
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/pip/")
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/pip)
-if(APPLE)
-	if(NOT CMAKE_CROSSCOMPILING)
-		include_directories(/usr/local/include)
-		link_directories(/usr/local/lib)
-	endif()
+if(APPLE AND (NOT CMAKE_CROSSCOMPILING))
+	include_directories(/usr/local/include)
+	link_directories(/usr/local/lib)
 endif()
 if(MINGW)
 	find_package(MinGW REQUIRED)
diff --git a/qad/FindQAD.cmake b/qad/FindQAD.cmake
index 875609f..95b7a53 100644
--- a/qad/FindQAD.cmake
+++ b/qad/FindQAD.cmake
@@ -12,17 +12,27 @@ set(_SEARCH_DIR)
 if(WIN32)
 	find_package(MinGW REQUIRED)
 endif()
-if(APPLE)
-	include_directories(/usr/local/include)
-	link_directories(/usr/local/lib)
+set(_QAD_INCDIR)
+set(_QAD_LIBDIR)
+if(MINGW_INCLUDE)
+	list(APPEND _QAD_INCDIR "${MINGW_INCLUDE}/qad")
+	list(APPEND _QAD_LIBDIR "${MINGW_LIB}")
 endif()
-find_file(QAD_H_INCLUDE "qad_types.h" HINTS ${PIP_DIR}/include/qad ${MINGW_INCLUDE}/qad /usr/include/qad /usr/local/include/qad $ENV{SMSDK_DIR}/include/qad)
+if(NOT CMAKE_CROSSCOMPILING)
+	list(APPEND _QAD_INCDIR "/usr/include/qad" "/usr/local/include/qad")
+	list(APPEND _QAD_LIBDIR "/usr/lib" "/usr/local/lib")
+	if(APPLE)
+		include_directories(/usr/local/include)
+		link_directories(/usr/local/lib)
+	endif()
+endif()
+find_file(QAD_H_INCLUDE "qad_types.h" HINTS ${PIP_DIR}/include/qad ${_QAD_INCDIR} $ENV{SMSDK_DIR}/include/qad)
 if (DEFINED ANDROID_PLATFORM)
 	set(QAD_INCLUDES ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include/qad)
 else()
 	get_filename_component(QAD_INCLUDES ${QAD_H_INCLUDE} PATH)
 endif()
-set(_SEARCH_DIR ${MINGW_LIB} /usr/lib /usr/local/lib $ENV{SMSDK_DIR}/lib)
+set(_SEARCH_DIR ${_QAD_LIBDIR} $ENV{SMSDK_DIR}/lib)
 set(_QAD_LIBS utils widgets application blockview graphic sql_table touch_widgets)
 if(LIBPROJECT)
 	set(QAD_INCLUDES ${QAD_DIR})