git-svn-id: svn://db.shs.com.ru/pip@786 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

This commit is contained in:
2019-04-23 09:54:41 +00:00
parent 8f6a2dbf78
commit f9d6b82969

View File

@@ -59,14 +59,29 @@ else()
message(STATUS "Building PIP shared library")
endif()
#if(LIB)
if(LIB)
if(WIN32)
if(MINGW)
find_package(MinGW REQUIRED)
set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
list(APPEND CMAKE_LIBRARY_PATH ${MINGW_LIB})
endif()
else()
if(APPLE)
set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr/local)
else()
if (DEFINED ANDROID_PLATFORM)
set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr)
else()
if(CMAKE_CROSSCOMPILING)
set(CMAKE_INSTALL_PREFIX ${CMAKE_STAGING_PREFIX})
else()
set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr)
endif()
endif()
endif()
endif()
#endif()
endif()
if ("x${PIP_RC}" STREQUAL "x")
set(PIP_CMG "${CMAKE_CURRENT_BINARY_DIR}/utils/code_model_generator/pip_cmg")
@@ -111,10 +126,6 @@ endif()
# Compiler
get_filename_component(C_COMPILER "${CMAKE_C_COMPILER}" NAME)
set(INSTALL_PREFIX "")
if(CMAKE_CROSSCOMPILING)
set(INSTALL_PREFIX "${CMAKE_FIND_ROOT_PATH}/")
endif()
#link_directories(${CMAKE_CURRENT_BINARY_DIR})
#message("${C_COMPILER}")
@@ -488,8 +499,6 @@ endif(NOT PIP_FREERTOS)
if(LIB)
if(WIN32)
if(MINGW)
find_package(MinGW REQUIRED)
set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
install(FILES ${HDRS} DESTINATION ${MINGW_INCLUDE}/pip)
install(TARGETS ${PIP_LIBS_TARGETS} DESTINATION ${MINGW_LIB})
install(TARGETS ${PIP_LIBS_TARGETS} DESTINATION ${MINGW_BIN})
@@ -504,15 +513,6 @@ if(LIB)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pip_export.h DESTINATION include)
endif()
else()
if(APPLE)
set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr/local)
else()
if (DEFINED ANDROID_PLATFORM)
set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr)
else()
set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr)
endif()
endif()
install(FILES ${HDRS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip)
install(TARGETS ${PIP_LIBS_TARGETS} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
endif()
@@ -537,11 +537,11 @@ if(NOT PIP_FREERTOS)
# Utils
add_subdirectory("utils/code_model_generator")
add_subdirectory("utils/resources_compiler")
if(PIP_UTILS)
add_subdirectory("utils/system_test")
add_subdirectory("utils/remote_console")
add_subdirectory("utils/code_model_generator")
add_subdirectory("utils/resources_compiler")
add_subdirectory("utils/udp_file_transfer")
if(sodium_FOUND)
add_subdirectory("utils/system_daemon")