From 93361f51ad192b8a80c21c5807e7dddce627e562 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: Fri, 15 Feb 2019 10:27:56 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@488 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/FindQAD.cmake | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/qad/FindQAD.cmake b/qad/FindQAD.cmake index 24317ea..fa427ae 100644 --- a/qad/FindQAD.cmake +++ b/qad/FindQAD.cmake @@ -11,20 +11,14 @@ get_directory_property(hasParent PARENT_DIRECTORY) set(_SEARCH_DIR) if(WIN32) find_package(MinGW REQUIRED) - set(_SEARCH_DIR ${MINGW_LIB}) - set(QAD_INCLUDES ${MINGW_INCLUDE}/qad) -else() - if (DEFINED ANDROID_PLATFORM) - set(QAD_INCLUDES ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include/qad) - else() - set(_DIR_ "/usr") - if(APPLE) - set(_DIR_ "/usr/local") - endif() - set(_SEARCH_DIR ${_DIR_}/lib/) - set(QAD_INCLUDES ${_DIR_}/include/qad) - endif() 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 (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(_QAD_LIBS utils widgets application blockview graphic sql_table touch_widgets) if(LIBPROJECT) set(QAD_INCLUDES)