BIG deep clean
This commit is contained in:
@@ -16,7 +16,6 @@ main library
|
||||
]]
|
||||
|
||||
cmake_policy(SET CMP0011 NEW) # don`t affect includer policies
|
||||
#set(_PIP_MODULES pip pip_usb pip_crypt pip_fftw)
|
||||
if(WIN32)
|
||||
find_package(MinGW REQUIRED)
|
||||
endif()
|
||||
@@ -33,10 +32,6 @@ 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()
|
||||
else()
|
||||
if(NOT WIN32)
|
||||
list(APPEND _PIP_INCDIR "/usr/include/pip" "/usr/local/include/pip")
|
||||
@@ -60,9 +55,6 @@ else()
|
||||
endif()
|
||||
list(APPEND _PIP_BINDIR "${PIP_DIR}/bin")
|
||||
set(_pip_suffix "")
|
||||
#if(DEFINED ANDROID_PLATFORM)
|
||||
# set(_pip_suffix "_${ANDROID_ABI}")
|
||||
#endif()
|
||||
|
||||
find_library(PIP_LIBRARY pip${_pip_suffix} HINTS ${_PIP_LIBDIR})
|
||||
find_library(PIP_USB_LIBRARY pip_usb${_pip_suffix} HINTS ${_PIP_LIBDIR})
|
||||
@@ -73,11 +65,7 @@ find_library(PIP_IO_UTILS_LIBRARY pip_io_utils${_pip_suffix} HINTS ${_PIP_LIBDIR
|
||||
find_library(PIP_CONCURRENT_LIBRARY pip_concurrent${_pip_suffix} HINTS ${_PIP_LIBDIR})
|
||||
find_library(PIP_CLOUD_LIBRARY pip_cloud HINTS${_pip_suffix} ${_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()
|
||||
get_filename_component(PIP_INCLUDES ${PIP_H_INCLUDE} PATH)
|
||||
#endif()
|
||||
get_filename_component(PIP_INCLUDES ${PIP_H_INCLUDE} PATH)
|
||||
set(__ext "")
|
||||
if ("x${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "xWindows")
|
||||
set(__ext ".exe")
|
||||
|
||||
Reference in New Issue
Block a user