FreeRTOS console and io devices support for compile
git-svn-id: svn://db.shs.com.ru/pip@688 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
@@ -120,10 +120,8 @@ endif()
|
||||
# Main lib
|
||||
set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io_devices" "io_utils" "console" "math" "code" "geo" "resources" "opencl" "crypt")
|
||||
if(PIP_FREERTOS)
|
||||
list(REMOVE_ITEM PIP_FOLDERS "io_devices")
|
||||
include_directories("${PIP_SRC_MAIN}/io_devices")
|
||||
list(REMOVE_ITEM PIP_FOLDERS "console")
|
||||
include_directories("${PIP_SRC_MAIN}/console")
|
||||
#list(REMOVE_ITEM PIP_FOLDERS "console")
|
||||
#include_directories("${PIP_SRC_MAIN}/console")
|
||||
endif()
|
||||
include_directories("${PIP_SRC_MAIN}")
|
||||
set(PIP_MAIN_FOLDERS)
|
||||
@@ -132,7 +130,6 @@ foreach(F ${PIP_FOLDERS})
|
||||
include_directories("${PIP_SRC_MAIN}/${F}")
|
||||
gather_src("${PIP_SRC_MAIN}/${F}" CPP_LIB_MAIN HDRS PHDRS)
|
||||
endforeach(F)
|
||||
|
||||
# Crypt lib
|
||||
gather_src("${PIP_SRC_CRYPT}" CPP_LIB_CRYPT HDRS PHDRS)
|
||||
|
||||
@@ -234,7 +231,7 @@ if(ICU)
|
||||
add_definitions(-DPIP_ICU)
|
||||
list(APPEND LIBS_MAIN icuuc)
|
||||
else()
|
||||
message(STATUS "Building PIP without ICU, attention!")
|
||||
message(STATUS "Building PIP without ICU")
|
||||
endif()
|
||||
|
||||
|
||||
@@ -465,9 +462,19 @@ else(NOT PIP_FREERTOS)
|
||||
message(STATUS "Building PIP with crypt support")
|
||||
add_definitions(-DPIP_CRYPT)
|
||||
add_library(pip_crypt ${PIP_LIB_TYPE} ${CPP_LIB_CRYPT})
|
||||
target_link_libraries(pip_crypt pip ${sodium_FOUND})
|
||||
list(APPEND LIBS_STATUS sodium)
|
||||
target_link_libraries(pip_crypt pip)
|
||||
list(APPEND PIP_LIBS_TARGETS pip_crypt)
|
||||
set(IO_UTILS_LIBS pip)
|
||||
add_library(pip_io_utils ${PIP_LIB_TYPE} ${CPP_LIB_IO_UTILS})
|
||||
message(STATUS "Building PIP IO Utils library with crypt support")
|
||||
list(APPEND IO_UTILS_LIBS pip_crypt)
|
||||
target_link_libraries(pip_io_utils ${IO_UTILS_LIBS})
|
||||
list(APPEND PIP_LIBS_TARGETS pip_io_utils)
|
||||
message(STATUS "Building PIP with zlib compress support")
|
||||
add_definitions(-DPIP_COMPRESS)
|
||||
add_library(pip_compress ${PIP_LIB_TYPE} ${CPP_LIB_COMPRESS})
|
||||
target_link_libraries(pip_compress pip)
|
||||
list(APPEND PIP_LIBS_TARGETS pip_compress)
|
||||
endif(NOT PIP_FREERTOS)
|
||||
|
||||
# Install
|
||||
|
||||
Reference in New Issue
Block a user