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)