From 9e8d95d56a76a36238224dfea48986b043e14076 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?= <peri4ko@yandex.ru>
Date: Tue, 10 Mar 2020 15:57:23 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@945
 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

---
 FindPIP.cmake | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/FindPIP.cmake b/FindPIP.cmake
index 15edf68e..78de968e 100644
--- a/FindPIP.cmake
+++ b/FindPIP.cmake
@@ -2,27 +2,42 @@
 if(WIN32)
 	find_package(MinGW REQUIRED)
 endif()
-set(_PIP_INCDIR)
+
+set(_PIP_INCDIR "${PIP_DIR}/include/pip")
 set(_PIP_LIBDIR "${PIP_DIR}/lib")
-set(_PIP_BINDIR "${PIP_DIR}/bin")
+set(_PIP_BINDIR)
+
 if(MINGW_INCLUDE)
 	list(APPEND _PIP_INCDIR "${MINGW_INCLUDE}/pip")
 	list(APPEND _PIP_LIBDIR "${MINGW_LIB}")
-	list(APPEND _PIP_BINDIR "${MINGW_BIN}")
 endif()
 if(CMAKE_CROSSCOMPILING)
 	list(APPEND _PIP_INCDIR "${CMAKE_PREFIX_PATH}/include/pip")
 	list(APPEND _PIP_LIBDIR "${CMAKE_PREFIX_PATH}/lib")
 else()
-	list(APPEND _PIP_INCDIR "/usr/include/pip" "/usr/local/include/pip")
-	list(APPEND _PIP_LIBDIR "/usr/lib" "/usr/local/lib")
+	if(NOT WIN32)
+		list(APPEND _PIP_INCDIR "/usr/include/pip" "/usr/local/include/pip")
+		list(APPEND _PIP_LIBDIR "/usr/lib" "/usr/local/lib")
+	endif()
 	if(APPLE)
 		include_directories(/usr/local/include)
 		link_directories(/usr/local/lib)
 	endif()
 endif()
-list(APPEND _PIP_BINDIR "/usr/bin" "/usr/local/bin")
 list(APPEND _PIP_LIBDIR "$ENV{SMSDK_DIR}/lib")
+
+if(MINGW_INCLUDE)
+	list(APPEND _PIP_BINDIR "${MINGW_BIN}")
+endif()
+if(CMAKE_CROSSCOMPILING)
+	if(NOT WIN32)
+		list(APPEND _PIP_BINDIR "/usr/bin" "/usr/local/bin")
+	endif()
+else()
+	list(APPEND _PIP_BINDIR "${CMAKE_PREFIX_PATH}/bin")
+endif()
+list(APPEND _PIP_BINDIR "${PIP_DIR}/bin")
+
 find_library(PIP_LIBRARY pip HINTS ${_PIP_LIBDIR})
 find_library(PIP_USB_LIBRARY pip_usb HINTS ${_PIP_LIBDIR})
 find_library(PIP_CRYPT_LIBRARY pip_crypt HINTS ${_PIP_LIBDIR})
@@ -31,7 +46,7 @@ find_library(PIP_COMPRESS_LIBRARY pip_compress HINTS ${_PIP_LIBDIR})
 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_DIR}/include/pip ${_PIP_INCDIR} $ENV{SMSDK_DIR}/include/pip)
+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()