diff options
| author |  vnugent <public@vaughnnugent.com> | 2024-11-07 01:51:17 -0500 |
|---|---|---|
| committer | vnugent <public@vaughnnugent.com> | 2024-11-07 01:51:17 -0500 |
| commit | 0baa4afd4716ad4d6d2f37b9d4af4fc839d16d7c (patch) | |
| tree | 41eaf4d02b2a956ea71a93e8e6bf5d58a88d724e | |
| parent | 5f89f4494267a0dd175682f593bcd5495a3dbbda (diff) | |
target mbedtls specific properties
| -rw-r--r-- | CMakeLists.txt | 49 | ||||
| -rw-r--r-- | Module.Taskfile.yaml | 2 |
2 files changed, 37 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ccd39db..c6a2c05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,8 +102,6 @@ if(NC_ENABLE_UTILS) #notify the project that utils are enabled list(APPEND NC_PROJ_DEFINTIONS NC_ENABLE_UTILS) - - message(STATUS "Utilities libraries are enabled") endif() #static/shared library @@ -146,26 +144,34 @@ target_include_directories(${_NC_PROJ_NAME}_static SYSTEM PUBLIC vendor/secp256k #Include mbedtls if enabled if(NC_FETCH_MBEDTLS) - ############### - # NOTE: Must disable shared libraries to avoid linking errors when using mbedtls - ############### - set(BUILD_SHARED_LIBS OFF) - - set(ENABLE_PROGRAMS OFF) - set(ENABLE_TESTING OFF) - set(USE_SHARED_MBEDTLS_LIBRARY OFF) - set(USE_STATIC_MBEDTLS_LIBRARY ON) - set(DISABLE_PACKAGE_CONFIG_AND_INSTALL OFF) set(MBEDTLS_CONFIG_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vendor/mbedtls/mbedtls_noscrypt_config.h" CACHE STRING "" FORCE) FetchContent_Declare( libmbedtls GIT_REPOSITORY https://github.com/Mbed-TLS/mbedtls.git - GIT_TAG v3.6.0 + GIT_TAG v3.6.2 GIT_PROGRESS TRUE ) - FetchContent_MakeAvailable(libmbedtls) + FetchContent_MakeAvailable(libmbedtls) + + ############### + # NOTE: Must disable shared libraries to avoid linking errors when using mbedtls + ############### + + set_target_properties( + mbedcrypto + mbedtls + + PROPERTIES + ENABLE_PROGRAMS OFF + ENABLE_TESTING OFF + BUILD_SHARED_LIBS OFF + POSITION_INDEPENDENT_CODE ON + USE_SHARED_MBEDTLS_LIBRARY OFF + USE_STATIC_MBEDTLS_LIBRARY ON + DISABLE_PACKAGE_CONFIG_AND_INSTALL OFF + ) set(CRYPTO_LIB "mbedtls") #enable linking to mbedtls @@ -397,6 +403,21 @@ if(NC_BUILD_TESTS) endif() +message("\n${_NC_PROJ_NAME} project summary") +message("=====================================") +message(" -- Configuration: ${build_type} --") +message(" Testing enabled: ....... ${NC_BUILD_TESTS}") +message(" Crypto library: ........ ${CRYPTO_LIB}") +message(" Input validation: ...... ${NC_DISABLE_INPUT_VALIDATION}") +message(" Monocypher: ............ ${NC_INCLUDE_MONOCYPHER}") +message(" Fetched seckp256k1: .... ${NC_FETCH_SECP256K1}") +message(" Fetched MbedTLS: ....... ${NC_FETCH_MBEDTLS}") +message(" Utilities enabled: ..... ${NC_ENABLE_UTILS}") +message(" Defintions: ${NC_PROJ_DEFINTIONS}") +message(" Compiler flags: ${_NC_COMPILE_OPTS}") +message("=====================================") + + ########################### # # Installing diff --git a/Module.Taskfile.yaml b/Module.Taskfile.yaml index 1d33c85..3a73704 100644 --- a/Module.Taskfile.yaml +++ b/Module.Taskfile.yaml @@ -29,6 +29,8 @@ tasks: - cmd: task test -- -DNC_ENABLE_UTILS=ON - cmd: wsl task test -- -DNC_ENABLE_UTILS=ON - cmd: wsl task memcheck + - cmd: task test-mbedtls -- -DNC_ENABLE_UTILS=ON + #called by build pipeline to build module build: |