diff options
| author | Garrett D'Amore <garrett@damore.org> | 2024-02-25 13:23:35 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2024-02-25 13:23:35 -0800 |
| commit | 380799e0449142637d69ebf770d0f7c2ed9ca883 (patch) | |
| tree | e19c52a80b201df6b9e9315d379a147465619bb2 | |
| parent | 6a403d0d3013e6e3862f5e2292d4638bd1aba512 (diff) | |
| download | nng-380799e0449142637d69ebf770d0f7c2ed9ca883.tar.gz nng-380799e0449142637d69ebf770d0f7c2ed9ca883.tar.bz2 nng-380799e0449142637d69ebf770d0f7c2ed9ca883.zip | |
build: Mbed TLS should use MBEDTLS_ROOT first.
The old MBEDTLS_ROOT_DIR is still honored for legacy compat, but
the version 4.3 find script won't use it by default.
| -rw-r--r-- | cmake/FindMbedTLS.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmake/FindMbedTLS.cmake b/cmake/FindMbedTLS.cmake index db065ca4..2d3f05e2 100644 --- a/cmake/FindMbedTLS.cmake +++ b/cmake/FindMbedTLS.cmake @@ -28,10 +28,13 @@ # # Hints: # -# Set ``MBEDTLS_ROOT_DIR`` to the root directory of Mbed TLS installation. +# Set ``MBEDTLS_ROOT`` to the root directory of Mbed TLS installation. # -set(_MBEDTLS_ROOT_HINTS ${MBEDTLS_ROOT_DIR} ENV MBEDTLS_ROOT_DIR) +set(_MBEDTLS_ROOT_HINTS ${MBEDTLS_ROOT} ENV MBEDTLS_ROOT) +if (NOT _MBEDTLS_ROOT_HINTS) + set(_MBEDTLS_ROOT_HINTS ${MBEDTLS_ROOT_DIR} ENV MBEDTLS_ROOT_DIR) +endif() set(_MBED_REQUIRED_VARS MbedTLS_TARGET MbedX509_TARGET MbedCrypto_TARGET MbedTLS_VERSION) |