cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-08-21 19:46:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8302 from davidhorstmann-arm/cmake-fix-3rdparty-custom-config-2.28

Browse Source 
[Backport 2.28] CMake: fix build with 3rdparty module enabled through a custom config
This commit is contained in:
Paul Elliott 2023-10-04 22:59:43 +00:00 committed by GitHub
commit 36a4ea5c01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
3rdparty/CMakeLists.txt vendored
View File

@ -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)

3
ChangeLog.d/fix-cmake-3rdparty-custom-config.txt Normal file
View File

@ -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.