forge-joniko/ldc-tid-logistique
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 6

Add workaround for WolSSL CMake requirement

Browse source
This commit is contained in:
Gaurav Ujjwal 2022-02-22 15:51:35 +05:30
parent a5f3faedba
commit ce4e838351
3 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/CMakeLists.txt
View file

@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.10)
project(NativeVNC C CXX ASM)
set(AVNC_EXTERN_DIR ${PROJECT_SOURCE_DIR}/../extern)
set(BUILD_SHARED_LIBS OFF)
set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared Libs" FORCE)
###############################################################################
# Utilities

21
build.gradle
View file

@ -21,4 +21,23 @@ allprojects {
task clean(type: Delete) {
delete rootProject.buildDir
}
}
/**
* Temporary workaround to enable CMake 3.10 compatibility for WolfSSL
*/
try {
def cl = file('extern/wolfssl/CMakeLists.txt')
def Fix1Old = 'cmake_minimum_required(VERSION 3.16)'
def Fix1New = 'cmake_minimum_required(VERSION 3.10)'
def Fix2Old = 'list(JOIN HEADER_EXCLUDE "|" EXCLUDED_HEADERS_REGEX)'
def Fix2New = 'string(REPLACE ";" "|" EXCLUDED_HEADERS_REGEX "${HEADER_EXCLUDE}")'
cl.text = cl.text.replace(Fix1Old, Fix1New).replace(Fix2Old, Fix2New)
gradle.buildFinished {
cl.text = cl.text.replace(Fix1New, Fix1Old).replace(Fix2New, Fix2Old)
}
} catch (FileNotFoundException ignored) {
}

2
extern/wolfssl vendored

@ -1 +1 @@
Subproject commit 7e01af012157bc20c840011a018619915380f05c
Subproject commit e6c07a296d2996e8d5c3cc615dfc50013bbcc794