From c6fdb34daab13565cd2d19465d59be2cbc90cbfd Mon Sep 17 00:00:00 2001 From: elms Date: Wed, 19 Jan 2022 13:29:09 -0800 Subject: [PATCH] cmake: enable ASM and fix thread with usersettings * Assembly files were not being compiled. * With When `-DWOLFSSL_USER_SETTINGS` `HAVE_PTHREAD` was not propagating to `config.h` --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7fa246dc9..369ca0847 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") You must delete them, or cmake will refuse to work.") endif() -project(wolfssl VERSION 5.1.2 LANGUAGES C) +project(wolfssl VERSION 5.1.2 LANGUAGES C ASM) # shared library versioning # increment if interfaces have been added, removed or changed @@ -221,6 +221,7 @@ add_option("WOLFSSL_SINGLE_THREADED" ${WOLFSSL_SINGLE_THREADED_HELP_STRING} "no" if(NOT WOLFSSL_SINGLE_THREADED) if(CMAKE_USE_PTHREADS_INIT) list(APPEND WOLFSSL_LINK_LIBS Threads::Threads) + set(HAVE_PTHREAD 1) list(APPEND WOLFSSL_DEFINITIONS "-DHAVE_PTHREAD" "-D_POSIX_THREADS")