wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 11:17:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7188 from innolectric/innolectric

Browse Source 
Innolectric CMake changes
This commit is contained in:
Daniel Pouzzner
2024-02-05 16:08:58 -05:00
committed by GitHub
parent 9060da42a6 944c7e175b
commit 2b33079d50
2 changed files with 83 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -215,6 +215,8 @@ if(WOLFSSL_REPRODUCIBLE_BUILD)
set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -D <TARGET>") set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -D <TARGET>")
endif() endif()
add_option("WOLFSSL_INSTALL" "Create install target for WolfSSL project" "no" "yes;no")
# Support for forcing 32-bit mode # Support for forcing 32-bit mode
# TODO: detect platform from other options # TODO: detect platform from other options
add_option("WOLFSSL_32BIT" add_option("WOLFSSL_32BIT"
@ -1662,17 +1664,14 @@ if(WOLFSSL_FAST_MATH)
list(APPEND WOLFSSL_DEFINITIONS "-DUSE_FAST_MATH") list(APPEND WOLFSSL_DEFINITIONS "-DUSE_FAST_MATH")
set(WOLFSSL_SLOWMATH "no") set(WOLFSSL_SLOWMATH "no")
endif() endif()
if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64|AMD64")
# Have settings.h set FP_MAX_BITS higher if user didn't set directly
list(APPEND WOLFSSL_DEFINITIONS "-DWOLFSSL_X86_64_BUILD")
endif()
endif() endif()
# TODO: - Fast huge math # TODO: - Fast huge math
# Set processor-specific build macros # Set processor-specific build macros
if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64|AMD64") if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64|AMD64")
set(WOLFSSL_X86_64_BUILD ON)
add_option("WOLFSSL_X86_64_BUILD_ASM" "Build ASM files" "yes" "yes;no")
list(APPEND WOLFSSL_DEFINITIONS "-DWOLFSSL_X86_64_BUILD") list(APPEND WOLFSSL_DEFINITIONS "-DWOLFSSL_X86_64_BUILD")
elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "aarch64|arm64") elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "aarch64|arm64")
list(APPEND WOLFSSL_DEFINITIONS "-DWOLFSSL_AARCH64_BUILD") list(APPEND WOLFSSL_DEFINITIONS "-DWOLFSSL_AARCH64_BUILD")
@ -2523,6 +2522,8 @@ list(JOIN HEADER_EXCLUDE "|" EXCLUDED_HEADERS_REGEX)
string(PREPEND EXCLUDED_HEADERS_REGEX "(") string(PREPEND EXCLUDED_HEADERS_REGEX "(")
string(APPEND EXCLUDED_HEADERS_REGEX ")") string(APPEND EXCLUDED_HEADERS_REGEX ")")
if(WOLFSSL_INSTALL)
set(INSTALLED_EXAMPLES set(INSTALLED_EXAMPLES
${CMAKE_CURRENT_SOURCE_DIR}/examples/echoserver/echoserver.c ${CMAKE_CURRENT_SOURCE_DIR}/examples/echoserver/echoserver.c
${CMAKE_CURRENT_SOURCE_DIR}/examples/sctp/sctp-server.c ${CMAKE_CURRENT_SOURCE_DIR}/examples/sctp/sctp-server.c
@ -2534,6 +2535,7 @@ set(INSTALLED_EXAMPLES
${CMAKE_CURRENT_SOURCE_DIR}/examples/benchmark/tls_bench.c ${CMAKE_CURRENT_SOURCE_DIR}/examples/benchmark/tls_bench.c
${CMAKE_CURRENT_SOURCE_DIR}/examples/client/client.c) ${CMAKE_CURRENT_SOURCE_DIR}/examples/client/client.c)
# Install the library # Install the library
install(TARGETS wolfssl install(TARGETS wolfssl
EXPORT wolfssl-targets EXPORT wolfssl-targets
@ -2602,3 +2604,4 @@ install(FILES
${CMAKE_CURRENT_BINARY_DIR}/wolfssl-config-version.cmake ${CMAKE_CURRENT_BINARY_DIR}/wolfssl-config-version.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/wolfssl DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/wolfssl
) )
endif()

9
cmake/functions.cmake
View File

@ -280,7 +280,7 @@ function(generate_build_flags)
if(WOLFSSL_SP_ARM_CORTEX_ASM OR WOLFSSL_USER_SETTINGS) if(WOLFSSL_SP_ARM_CORTEX_ASM OR WOLFSSL_USER_SETTINGS)
set(BUILD_SP_ARM_CORTEX "yes" PARENT_SCOPE) set(BUILD_SP_ARM_CORTEX "yes" PARENT_SCOPE)
endif() endif()
if(WOLFSSL_SP_X86_64_ASM OR WOLFSSL_USER_SETTINGS) if(WOLFSSL_X86_64_BUILD AND (WOLFSSL_SP_X86_64_ASM OR WOLFSSL_USER_SETTINGS))
set(BUILD_SP_X86_64 "yes" PARENT_SCOPE) set(BUILD_SP_X86_64 "yes" PARENT_SCOPE)
endif() endif()
if(WOLFSSL_SP_MATH OR WOLFSSL_SP_MATH_ALL OR WOLFSSL_USER_SETTINGS) if(WOLFSSL_SP_MATH OR WOLFSSL_SP_MATH_ALL OR WOLFSSL_USER_SETTINGS)
@ -505,9 +505,10 @@ function(generate_lib_src_list LIB_SOURCES)
endif() endif()
if(BUILD_SP_X86_64) if(BUILD_SP_X86_64)
list(APPEND LIB_SOURCES list(APPEND LIB_SOURCES wolfcrypt/src/sp_x86_64.c)
wolfcrypt/src/sp_x86_64.c if(WOLFSSL_X86_64_BUILD_ASM)
wolfcrypt/src/sp_x86_64_asm.S) list(APPEND LIB_SOURCES wolfcrypt/src/sp_x86_64_asm.S)
endif()
endif() endif()
if(NOT BUILD_FIPS_V2 AND BUILD_SP_ARM32) if(NOT BUILD_FIPS_V2 AND BUILD_SP_ARM32)