From a00b37a628e78d23313fbd888c7204b6d2a82229 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?= Date: Tue, 7 Apr 2020 09:02:01 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@937 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/cmake/FindQAD.cmake | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/qad/cmake/FindQAD.cmake b/qad/cmake/FindQAD.cmake index 2aba8bd..b26f2e8 100644 --- a/qad/cmake/FindQAD.cmake +++ b/qad/cmake/FindQAD.cmake @@ -17,10 +17,10 @@ endif() if(CMAKE_CROSSCOMPILING) list(APPEND _QAD_INCDIR "${CMAKE_PREFIX_PATH}/include/qad") list(APPEND _QAD_LIBDIR "${CMAKE_PREFIX_PATH}/lib") - if (DEFINED ANDROID_PLATFORM) - list(APPEND _PIP_INCDIR ${CMAKE_PREFIX_PATH}/include/qad) - list(APPEND _PIP_LIBDIR ${CMAKE_PREFIX_PATH}/lib) - endif() + #if (DEFINED ANDROID_PLATFORM) + # list(APPEND _PIP_INCDIR ${CMAKE_PREFIX_PATH}/include/qad) + # list(APPEND _PIP_LIBDIR ${CMAKE_PREFIX_PATH}/lib) + #endif() include_directories(${CMAKE_PREFIX_PATH}/include) link_directories(${CMAKE_PREFIX_PATH}/lib) else() @@ -34,11 +34,11 @@ else() 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() +#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() +#endif() set(_SEARCH_DIR ${_QAD_LIBDIR} $ENV{SMSDK_DIR}/lib) set(_QAD_LIBS utils widgets application blockview graphic sql_table touch_widgets doc) if(LIBPROJECT)