mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-01-14 12:43:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Further improve error message clarity

Browse Source 
This commit further improves error message clarity.

Signed-off-by: Harry Ramsey <harry.ramsey@arm.com>
This commit is contained in:
Harry Ramsey 2024-10-28 14:05:23 +00:00
parent e05cf2e11e
commit 6d9c389957
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -323,10 +323,10 @@ if(LIB_INSTALL_DIR)
endif() endif()
if (NOT EXISTS "${MBEDTLS_FRAMEWORK_DIR}/CMakeLists.txt") if (NOT EXISTS "${MBEDTLS_FRAMEWORK_DIR}/CMakeLists.txt")
if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/") if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/")
message(FATAL_ERROR "${CMAKE_CURRENT_SOURCE_DIR}/.git/ not found. Please ensure you have downloaded a release version of Mbed TLS from GitHub.") message(FATAL_ERROR "${MBEDTLS_FRAMEWORK_DIR}/CMakeLists.txt not found (and does appear to be a git checkout). Run `git submodule update --init` from the source tree to fetch the submodule contents.")
else () else ()
message(FATAL_ERROR "${MBEDTLS_FRAMEWORK_DIR}/CMakeLists.txt not found. Run `git submodule update --init` from the source tree to fetch the submodule contents.") message(FATAL_ERROR "${MBEDTLS_FRAMEWORK_DIR}/CMakeLists.txt not found (and does not appear to be a git checkout). Please ensure you have downloaded the right archive from the release page on GitHub.")
endif() endif()
endif() endif()
add_subdirectory(framework) add_subdirectory(framework)

16
Makefile
View File

@ -6,23 +6,15 @@ ifneq (,$(filter-out lib library/%,$(or $(MAKECMDGOALS),all)))
ifeq (,$(wildcard framework/exported.make)) ifeq (,$(wildcard framework/exported.make))
# Use the define keyword to get a multi-line message. # Use the define keyword to get a multi-line message.
# GNU make appends ". Stop.", so tweak the ending of our message accordingly. # GNU make appends ". Stop.", so tweak the ending of our message accordingly.
define error_message
$(MBEDTLS_PATH)/framework/exported.make not found.
Run `git submodule update --init` to fetch the submodule contents.
This is a fatal error
endef
ifeq (,$(wildcard .git)) ifeq (,$(wildcard .git))
define error_message define error_message
$(MBEDTLS_PATH)/.git/ not found. ${MBEDTLS_FRAMEWORK_DIR}/CMakeLists.txt not found (and does appear to be a git checkout). Run `git submodule update --init` from the source tree to fetch the submodule contents.
Please ensure you have downloaded a release version of Mbed TLS from GitHub.
This is a fatal error This is a fatal error
endef endef
else else
define error_message define error_message
$(MBEDTLS_PATH)/framework/exported.make not found. ${MBEDTLS_FRAMEWORK_DIR}/CMakeLists.txt not found (and does not appear to be a git checkout). Please ensure you have downloaded the right archive from the release page on GitHub.
Run `git submodule update --init` to fetch the submodule contents. endef
This is a fatal error
endef
endif endif
$(error $(error_message)) $(error $(error_message))
endif endif