From 66a868b6afb7389db124c521d4ffb84a4ba2bbdf Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Fri, 29 Sep 2023 17:36:24 +0200 Subject: [PATCH] CMake: fix build with 3rdparty module enabled through a custom config Fixes #8165 Signed-off-by: Gilles Peskine --- 3rdparty/CMakeLists.txt | 6 +----- ChangeLog.d/fix-cmake-3rdparty-custom-config.txt | 3 +++ 2 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 ChangeLog.d/fix-cmake-3rdparty-custom-config.txt diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 18945e52ee..37480f2cfd 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -4,11 +4,7 @@ list (APPEND thirdparty_inc_public) list (APPEND thirdparty_inc) list (APPEND thirdparty_def) -execute_process(COMMAND ${MBEDTLS_PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/config.py -f ${CMAKE_CURRENT_SOURCE_DIR}/../include/mbedtls/config.h get MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED RESULT_VARIABLE result) - -if(${result} EQUAL 0) - add_subdirectory(everest) -endif() +add_subdirectory(everest) set(thirdparty_src ${thirdparty_src} PARENT_SCOPE) set(thirdparty_lib ${thirdparty_lib} PARENT_SCOPE) diff --git a/ChangeLog.d/fix-cmake-3rdparty-custom-config.txt b/ChangeLog.d/fix-cmake-3rdparty-custom-config.txt new file mode 100644 index 0000000000..c52aa3deee --- /dev/null +++ b/ChangeLog.d/fix-cmake-3rdparty-custom-config.txt @@ -0,0 +1,3 @@ +Bugfix + * Fix the build with CMake when Everest is enabled through + a user configuration file or the compiler command line. Fixes #8165.