SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

cmake fixes

Browse Source
This commit is contained in:
Бычков Андрей
2020-11-06 15:10:24 +03:00
parent ae08ff72ea
commit 0614c3df96
2 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
CMakeLists.txt
View File

@@ -439,24 +439,9 @@ if (NOT CROSSTOOLS)
endif() endif()
else() else()
pip_module(crypt "sodium" "PIP crypt support" "" "")
set(PIP_MSG_crypt "yes") pip_module(compress "zlib" "PIP compression support" "" "")
set(PIP_MSG_compress "yes") pip_module(io_utils "pip_crypt" "PIP I/O support" "" " (+crypt)")
set(PIP_MODULES pip)
add_definitions(-DPIP_CRYPT)
add_library(pip_crypt ${pip_LIB_TYPE} ${CPP_LIB_CRYPT})
target_link_libraries(pip_crypt pip)
list(APPEND PIP_MODULES pip_crypt)
set(IO_UTILS_LIBS pip)
add_library(pip_io_utils ${pip_LIB_TYPE} ${CPP_LIB_IO_UTILS})
list(APPEND IO_UTILS_LIBS pip_crypt)
target_link_libraries(pip_io_utils ${IO_UTILS_LIBS})
list(APPEND PIP_MODULES pip_io_utils)
add_definitions(-DPIP_COMPRESS)
add_library(pip_compress ${pip_LIB_TYPE} ${CPP_LIB_COMPRESS})
target_link_libraries(pip_compress pip)
list(APPEND PIP_MODULES pip_compress)
endif() endif()
endif() endif()

4
esp-idf/CMakeLists.txt
View File

@@ -31,6 +31,6 @@ add_compile_options(${IDF_CXX_COMPILE_OPTIONS})
add_definitions(-DESP_PLATFORM) add_definitions(-DESP_PLATFORM)
add_definitions(-DGCC_NOT_5_2_0=0) add_definitions(-DGCC_NOT_5_2_0=0)
add_definitions(-DHAVE_CONFIG_H) add_definitions(-DHAVE_CONFIG_H)
include(../CMakeLists.txt) add_subdirectory(.. pip)
target_link_libraries(${COMPONENT_TARGET} pip pip_crypt pip_io_utils pip_compress) target_link_libraries(${COMPONENT_TARGET} PIP::Crypt PIP::IOUtils PIP::Compress)