3rdparty: Add additional build facilities for 3rd-party code
This commit is contained in:
parent
181f284e39
commit
655ddababa
5 changed files with 12 additions and 6 deletions
|
@ -181,7 +181,7 @@ else()
|
|||
set(LIB_INSTALL_DIR lib)
|
||||
endif()
|
||||
|
||||
include_directories(include/ 3rdparty/everest/include/ 3rdparty/everest/include/everest/ 3rdparty/everest/include/everest/kremlin/ 3rdparty/everest/include/everest/kremlib/)
|
||||
include_directories(include/)
|
||||
|
||||
if(ENABLE_ZLIB_SUPPORT)
|
||||
find_package(ZLIB)
|
||||
|
@ -192,6 +192,10 @@ if(ENABLE_ZLIB_SUPPORT)
|
|||
endif(ENABLE_ZLIB_SUPPORT)
|
||||
|
||||
add_subdirectory(3rdparty)
|
||||
include_directories(${thirdparty_inc})
|
||||
list(APPEND libs ${thirdparty_lib})
|
||||
add_definitions(${thirdparty_def})
|
||||
|
||||
add_subdirectory(library)
|
||||
add_subdirectory(include)
|
||||
add_subdirectory(crypto/library)
|
||||
|
|
|
@ -3,9 +3,8 @@ option(INSTALL_MBEDTLS_HEADERS "Install mbed TLS headers." ON)
|
|||
if(INSTALL_MBEDTLS_HEADERS)
|
||||
|
||||
file(GLOB headers "mbedtls/*.h")
|
||||
file(GLOB headers_everest "../3rdparty/everest/include/*.h")
|
||||
|
||||
install(FILES ${headers} ${headers_everest}
|
||||
install(FILES ${headers}
|
||||
DESTINATION include/mbedtls
|
||||
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
|
||||
|
||||
|
|
|
@ -64,9 +64,10 @@ set(src_crypto
|
|||
version.c
|
||||
version_features.c
|
||||
xtea.c
|
||||
${src_thirdparty}
|
||||
)
|
||||
|
||||
list(APPEND src_crypto ${thirdparty_src})
|
||||
|
||||
set(src_x509
|
||||
certs.c
|
||||
pkcs11.c
|
||||
|
|
|
@ -18,7 +18,8 @@ LOCAL_LDFLAGS += -L../crypto/library
|
|||
LOCAL_CFLAGS += -I../crypto/include
|
||||
LOCAL_CXXFLAGS += -I../crypto/include
|
||||
|
||||
LOCAL_CFLAGS+=-I../3rdparty/everest/include
|
||||
include ../3rdparty/Makefile.inc
|
||||
LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES)
|
||||
|
||||
ifndef SHARED
|
||||
DEP=../crypto/library/libmbedcrypto.a ../library/libmbedx509.a ../library/libmbedtls.a
|
||||
|
|
|
@ -16,7 +16,8 @@ LOCAL_LDFLAGS += -L../crypto/library
|
|||
LOCAL_CFLAGS += -I../crypto/include
|
||||
CRYPTO := ../crypto/library/
|
||||
|
||||
LOCAL_CFLAGS+=-I../3rdparty/everest/include
|
||||
include ../3rdparty/Makefile.inc
|
||||
LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES)
|
||||
|
||||
# Enable definition of various functions used throughout the testsuite
|
||||
# (gethostname, strdup, fileno...) even when compiling with -std=c99. Harmless
|
||||
|
|
Loading…
Reference in a new issue