From 22f71b33e632c693450c7e65093eed0e4527dc96 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: Thu, 12 Mar 2020 16:55:10 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@949 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- FindPIP.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/FindPIP.cmake b/FindPIP.cmake index 78de968e..59a8889d 100644 --- a/FindPIP.cmake +++ b/FindPIP.cmake @@ -6,6 +6,7 @@ endif() set(_PIP_INCDIR "${PIP_DIR}/include/pip") set(_PIP_LIBDIR "${PIP_DIR}/lib") set(_PIP_BINDIR) +set(_PIP_FP_DP) if(MINGW_INCLUDE) list(APPEND _PIP_INCDIR "${MINGW_INCLUDE}/pip") @@ -30,6 +31,7 @@ if(MINGW_INCLUDE) list(APPEND _PIP_BINDIR "${MINGW_BIN}") endif() if(CMAKE_CROSSCOMPILING) + set(_PIP_FP_DP "NO_DEFAULT_PATH") if(NOT WIN32) list(APPEND _PIP_BINDIR "/usr/bin" "/usr/local/bin") endif() @@ -52,8 +54,8 @@ if (DEFINED ANDROID_PLATFORM) else() get_filename_component(PIP_INCLUDES ${PIP_H_INCLUDE} PATH) endif() -find_program(PIP_CMG pip_cmg HINTS ${_PIP_BINDIR}) -find_program(PIP_RC pip_rc HINTS ${_PIP_BINDIR}) +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("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") find_library(DL_LIBRARY dl) list(APPEND PIP_LIBRARY ${DL_LIBRARY})