mirror of
https://github.com/henrydcase/optee_eng.git
synced 2024-11-25 08:31:22 +00:00
make it compile
This commit is contained in:
parent
445f94f89b
commit
e8c71f1f88
@ -29,16 +29,17 @@ endif()
|
|||||||
|
|
||||||
# Build OpenSSL if not provided, otherwise define
|
# Build OpenSSL if not provided, otherwise define
|
||||||
# OpenSSL_ssl_shared and OpenSSL_crypto_shared
|
# OpenSSL_ssl_shared and OpenSSL_crypto_shared
|
||||||
if (BUILD_OPENSSL)
|
#if (BUILD_OPENSSL)
|
||||||
add_subdirectory(3rd/openssl-cmake)
|
# add_subdirectory(3rd/openssl-cmake)
|
||||||
else()
|
#else()
|
||||||
if (NOT OPENSSL_INSTALL_DIR)
|
# # if (NOT OPENSSL_INSTALL_DIR)
|
||||||
message(FATAL_ERROR "Must specify -DOPENSSL_INSTALL_DIR")
|
# # message(FATAL_ERROR "Must specify -DOPENSSL_INSTALL_DIR")
|
||||||
endif()
|
# #endif()
|
||||||
set(OPENSSL_BUILD_INSTALL_ROOT ${OPENSSL_INSTALL_DIR})
|
# set(OPENSSL_BUILD_INSTALL_ROOT ${OPENSSL_INSTALL_DIR})
|
||||||
set(OPENSSL_PREFIX_OPENSSLDIR ${CMAKE_INSTALL_PREFIX}${OPTEE_ENGINE_INSTALL_DIR}/openssl)
|
# set(OPENSSL_PREFIX_OPENSSLDIR ${CMAKE_INSTALL_PREFIX}${OPTEE_ENGINE_INSTALL_DIR}/openssl)
|
||||||
include(3rd/openssl-cmake/libdefs.cmake)
|
# include(3rd/openssl-cmake/libdefs.cmake)
|
||||||
endif()
|
#endif()
|
||||||
|
find_package(OpenSSL)
|
||||||
|
|
||||||
get_property(OPENSSL_INSTALL_DIR GLOBAL PROPERTY openssl_build_install_dir_property)
|
get_property(OPENSSL_INSTALL_DIR GLOBAL PROPERTY openssl_build_install_dir_property)
|
||||||
set(OPENSSL_INCLUDE_DIR ${OPENSSL_INSTALL_DIR}/include)
|
set(OPENSSL_INCLUDE_DIR ${OPENSSL_INSTALL_DIR}/include)
|
||||||
@ -132,7 +133,7 @@ target_link_directories(
|
|||||||
|
|
||||||
target_link_libraries(
|
target_link_libraries(
|
||||||
optee_eng
|
optee_eng
|
||||||
OpenSSL_crypto_shared
|
crypto
|
||||||
${CMAKE_DL_LIBS})
|
${CMAKE_DL_LIBS})
|
||||||
|
|
||||||
IF(${CMAKE_BUILD_TYPE} MATCHES "Debug")
|
IF(${CMAKE_BUILD_TYPE} MATCHES "Debug")
|
||||||
|
Loading…
Reference in New Issue
Block a user