From fc8dfce90dcd6b13c6ae30e2d27649b52fc5d793 Mon Sep 17 00:00:00 2001 From: pokamest Date: Sun, 12 Mar 2023 01:39:27 +0000 Subject: [PATCH] Lib prefix added to cloak libs --- client/android/cpp/CMakeLists.txt | 2 +- client/android/cpp/cloak | 2 +- client/android/cpp/cloak.cmake | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/android/cpp/CMakeLists.txt b/client/android/cpp/CMakeLists.txt index 1b84ab405..24de11765 100644 --- a/client/android/cpp/CMakeLists.txt +++ b/client/android/cpp/CMakeLists.txt @@ -76,7 +76,7 @@ endif() target_compile_definitions(ovpn3 PRIVATE -DUSE_OPENSSL ) - target_link_libraries(ovpn3 crypto ssl lzo lz4 ck-ovpn-plugin) + target_link_libraries(ovpn3 crypto ssl lzo lz4 libck-ovpn-plugin) else () target_compile_definitions(ovpn3 PRIVATE -DUSE_MBEDTLS diff --git a/client/android/cpp/cloak b/client/android/cpp/cloak index 8833a779c..6d19a801b 160000 --- a/client/android/cpp/cloak +++ b/client/android/cpp/cloak @@ -1 +1 @@ -Subproject commit 8833a779c44eb9be42fbfffbae83066019e54b6c +Subproject commit 6d19a801bc11974c66ffa433780a4a2946a04bcd diff --git a/client/android/cpp/cloak.cmake b/client/android/cpp/cloak.cmake index f85b42752..cdfb262f3 100644 --- a/client/android/cpp/cloak.cmake +++ b/client/android/cpp/cloak.cmake @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR) set(TARGET ck_ovpn_plugin_go) set(CLOAK_SRCS cloak/cmd/ck-ovpn-plugin/ck-ovpn-plugin.go) -set(CLOAK_LIB ck-ovpn-plugin.so) +set(CLOAK_LIB libck-ovpn-plugin.so) list(APPEND CMAKE_PROGRAM_PATH "/usr/local/go/bin") find_program(GO_EXEC go) @@ -41,9 +41,9 @@ add_custom_command( COMMENT "Building Go library") add_custom_target(${TARGET} DEPENDS ${CLOAK_LIB} ${HEADER}) -add_library(ck-ovpn-plugin STATIC IMPORTED GLOBAL) -add_dependencies(ck-ovpn-plugin ${TARGET}) -set_target_properties(ck-ovpn-plugin +add_library(libck-ovpn-plugin STATIC IMPORTED GLOBAL) +add_dependencies(libck-ovpn-plugin ${TARGET}) +set_target_properties(libck-ovpn-plugin PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/${CLOAK_LIB} INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR})