diff --git a/FindPIP.cmake b/FindPIP.cmake index bce75ba6..bea06190 100644 --- a/FindPIP.cmake +++ b/FindPIP.cmake @@ -2,14 +2,28 @@ if(WIN32) find_package(MinGW REQUIRED) endif() -find_library(PIP_LIBRARY pip HINTS ${PIP_DIR}/lib ${MINGW_LIB} /usr/lib /usr/local/lib $ENV{SMSDK_DIR}/lib) -find_library(PIP_USB_LIBRARY pip_usb HINTS ${PIP_DIR}/lib ${MINGW_LIB} /usr/lib /usr/local/lib $ENV{SMSDK_DIR}/lib) -find_library(PIP_CRYPT_LIBRARY pip_crypt HINTS ${PIP_DIR}/lib ${MINGW_LIB} /usr/lib /usr/local/lib $ENV{SMSDK_DIR}/lib) -find_library(PIP_FFTW_LIBRARY pip_fftw HINTS ${PIP_DIR}/lib ${MINGW_LIB} /usr/lib /usr/local/lib $ENV{SMSDK_DIR}/lib) -find_library(PIP_COMPRESS_LIBRARY pip_compress HINTS ${PIP_DIR}/lib ${MINGW_LIB} /usr/lib /usr/local/lib $ENV{SMSDK_DIR}/lib) -find_library(PIP_IO_UTILS_LIBRARY pip_io_utils HINTS ${PIP_DIR}/lib ${MINGW_LIB} /usr/lib /usr/local/lib $ENV{SMSDK_DIR}/lib) -find_library(PIP_CONCURRENT_LIBRARY pip_concurrent HINTS ${PIP_DIR}/lib ${MINGW_LIB} /usr/lib /usr/local/lib $ENV{SMSDK_DIR}/lib) -find_file(PIP_H_INCLUDE "pip.h" HINTS ${PIP_DIR}/include/pip ${MINGW_INCLUDE}/pip /usr/include/pip /usr/local/include/pip $ENV{SMSDK_DIR}/include/pip) +set(_PIP_INCDIR) +set(_PIP_LIBDIR) +if(MINGW_INCLUDE) + list(APPEND _PIP_INCDIR "${MINGW_INCLUDE}/pip") + list(APPEND _PIP_LIBDIR "${MINGW_LIB}") +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") + 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) +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()