fix building issues with example #7

example/CMakeLists.txt

@@ -1,10 +1,10 @@
-get_filename_component(MBEDTLS_SGX_ROOT_DIR ".." REALPATH BASE_DIR "${CMAKE_BINARY_DIR}")
-
-set(MBEDTLS_SGX_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}-${MBEDTLS_VERSION})
 set(MBEDTLS_SGX_INCLUDE_DIR ${MBEDTLS_SGX_ROOT}/include)
-set(MBEDTLS_SGX_LIBRARY_DIR ${MBEDTLS_SGX_ROOT}/libs)
-set(MBEDTLS_SGX_LIB_U ${MBEDTLS_SGX_LIBRARY_DIR}/libmbedtls_SGX_u.a)
-set(MBEDTLS_SGX_LIB_T ${MBEDTLS_SGX_LIBRARY_DIR}/libmbedtls_SGX_t.a)
+set(MBEDTLS_SGX_LIBRARY_DIR ${MBEDTLS_SGX_ROOT}/lib)
+set(MBEDTLS_SGX_LIB_U ${CMAKE_BINARY_DIR}/ocall/libmbedtls_SGX_u.a)
+set(MBEDTLS_SGX_LIB_T ${CMAKE_BINARY_DIR}/trusted/libmbedtls_SGX_t.a)
+
+message(${MBEDTLS_SGX_LIB_U})
+message(${MBEDTLS_SGX_LIB_T})
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})

example/enclave/CMakeLists.txt

@@ -16,18 +16,18 @@ add_custom_command(
         OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/Enclave_t.c
         COMMAND ${SGX_EDGER8R} --trusted Enclave.edl
         --search-path ${SGX_SDK}/include
-        --search-path ${MBEDTLS_SGX_LIBRARY_DIR}
+        --search-path ${CMAKE_SOURCE_DIR}/trusted
         COMMENT "Generating Enclave_t.{c,h}"
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
 
 add_library(enclave SHARED ${SOURCE_FILES})
 
 include_directories(
         $(CMAKE_CURRENT_SOURCE_DIR)
+        ${CMAKE_SOURCE_DIR}/include
         ${SGX_SDK}/include
         ${SGX_SDK}/include/tlibc
         ${SGX_SDK}/include/stlport
-        ${MBEDTLS_SGX_INCLUDE_DIR}
 )
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SGX_COMMON_CFLAGS} -nostdinc -fvisibility=hidden -fpie -fstack-protector")
@@ -51,4 +51,7 @@ add_custom_command(TARGET enclave
         -enclave enclave.so
         -out enclave.signed.so
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        COMMENT "Signing the enclave => ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/enclave.signed.so")
+        COMMENT "Signing the enclave => ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/enclave.signed.so")
+
+add_dependencies(enclave ${PROJECT_NAME}_t)
+add_dependencies(enclave ${PROJECT_NAME}_u)