From d8ce50bde5fd7ddc7473435386cedc345ea24557 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:01:57 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@1004 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- cmake/FindPIP.cmake | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cmake/FindPIP.cmake b/cmake/FindPIP.cmake index d2fafc23..bd8ee9bf 100644 --- a/cmake/FindPIP.cmake +++ b/cmake/FindPIP.cmake @@ -16,10 +16,10 @@ endif() if(CMAKE_CROSSCOMPILING) list(APPEND _PIP_INCDIR "${CMAKE_PREFIX_PATH}/include/pip") list(APPEND _PIP_LIBDIR "${CMAKE_PREFIX_PATH}/lib") - if (DEFINED ANDROID_PLATFORM) - list(APPEND _PIP_INCDIR ${CMAKE_PREFIX_PATH}/include/pip) - list(APPEND _PIP_LIBDIR ${CMAKE_PREFIX_PATH}/lib) - endif() + #if (DEFINED ANDROID_PLATFORM) + # list(APPEND _PIP_INCDIR ${CMAKE_PREFIX_PATH}/include/pip) + # list(APPEND _PIP_LIBDIR ${CMAKE_PREFIX_PATH}/lib) + #endif() else() if(NOT WIN32) list(APPEND _PIP_INCDIR "/usr/include/pip" "/usr/local/include/pip") @@ -52,11 +52,11 @@ find_library(PIP_IO_UTILS_LIBRARY pip_io_utils HINTS ${_PIP_LIBDIR}) find_library(PIP_CONCURRENT_LIBRARY pip_concurrent HINTS ${_PIP_LIBDIR}) find_library(PIP_CLOUD_LIBRARY pip_cloud HINTS ${_PIP_LIBDIR}) find_file(PIP_H_INCLUDE "pip.h" HINTS ${_PIP_INCDIR} $ENV{SMSDK_DIR}/include/pip) -if (DEFINED ANDROID_PLATFORM) - set(PIP_INCLUDES ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include/pip) -else() +#if (DEFINED ANDROID_PLATFORM) +# set(PIP_INCLUDES ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include/pip) +#else() get_filename_component(PIP_INCLUDES ${PIP_H_INCLUDE} PATH) -endif() +#endif() find_program(PIP_CMG pip_cmg HINTS ${_PIP_BINDIR} ${_PIP_FP_DP}) find_program(PIP_RC pip_rc HINTS ${_PIP_BINDIR} ${_PIP_FP_DP}) if (NOT PIP_LIBRARY)