diff --git a/FindPIP.cmake b/FindPIP.cmake
index bea06190..6ee3c2bd 100644
--- a/FindPIP.cmake
+++ b/FindPIP.cmake
@@ -3,34 +3,39 @@ if(WIN32)
 	find_package(MinGW REQUIRED)
 endif()
 set(_PIP_INCDIR)
-set(_PIP_LIBDIR)
+set(_PIP_LIBDIR "${PIP_DIR}/lib")
+set(_PIP_BINDIR "${PIP_DIR}/bin")
 if(MINGW_INCLUDE)
 	list(APPEND _PIP_INCDIR "${MINGW_INCLUDE}/pip")
 	list(APPEND _PIP_LIBDIR "${MINGW_LIB}")
+	list(APPEND _PIP_BINDIR "${MINGW_BIN}")
 endif()
 if(NOT CMAKE_CROSSCOMPILING)
 	list(APPEND _PIP_INCDIR "/usr/include/pip" "/usr/local/include/pip")
 	list(APPEND _PIP_LIBDIR "/usr/lib" "/usr/local/lib")
+	list(APPEND _PIP_BINDIR "/usr/bin" "/usr/local/bin")
 	if(APPLE)
 		include_directories(/usr/local/include)
 		link_directories(/usr/local/lib)
 	endif()
 endif()
-find_library(PIP_LIBRARY pip HINTS ${PIP_DIR}/lib ${_PIP_LIBDIR} $ENV{SMSDK_DIR}/lib)
-find_library(PIP_USB_LIBRARY pip_usb HINTS ${PIP_DIR}/lib ${_PIP_LIBDIR} $ENV{SMSDK_DIR}/lib)
-find_library(PIP_CRYPT_LIBRARY pip_crypt HINTS ${PIP_DIR}/lib ${_PIP_LIBDIR} $ENV{SMSDK_DIR}/lib)
-find_library(PIP_FFTW_LIBRARY pip_fftw HINTS ${PIP_DIR}/lib ${_PIP_LIBDIR} $ENV{SMSDK_DIR}/lib)
-find_library(PIP_COMPRESS_LIBRARY pip_compress HINTS ${PIP_DIR}/lib ${_PIP_LIBDIR} $ENV{SMSDK_DIR}/lib)
-find_library(PIP_IO_UTILS_LIBRARY pip_io_utils HINTS ${PIP_DIR}/lib ${_PIP_LIBDIR} $ENV{SMSDK_DIR}/lib)
-find_library(PIP_CONCURRENT_LIBRARY pip_concurrent HINTS ${PIP_DIR}/lib ${_PIP_LIBDIR} $ENV{SMSDK_DIR}/lib)
+list(APPEND _PIP_LIBDIR "$ENV{SMSDK_DIR}/lib")
+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})
+find_library(PIP_FFTW_LIBRARY pip_fftw HINTS ${_PIP_LIBDIR})
+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)
 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()
-find_program(PIP_CMG pip_cmg HINTS ${PIP_DIR}/bin ${MINGW_BIN} /usr/bin /usr/local/bin)
-find_program(PIP_RC pip_rc HINTS ${PIP_DIR}/bin ${MINGW_BIN} /usr/bin /usr/local/bin)
+find_program(PIP_CMG pip_cmg HINTS ${_PIP_BINDIR})
+find_program(PIP_RC pip_rc HINTS ${_PIP_BINDIR})
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
 	find_library(DL_LIBRARY dl)
 	list(APPEND PIP_LIBRARY ${DL_LIBRARY})