From 178841baa83834e6d17efbcdc4aeebe850256bb0 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 6 Feb 2018 12:34:21 +0100
Subject: rename lzo_static to just lzo

---
 main/src/main/cpp/CMakeLists.txt | 4 ++--
 main/src/main/cpp/lzo.cmake      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/src/main/cpp/CMakeLists.txt b/main/src/main/cpp/CMakeLists.txt
index 1aca0c36..65447398 100644
--- a/main/src/main/cpp/CMakeLists.txt
+++ b/main/src/main/cpp/CMakeLists.txt
@@ -56,7 +56,7 @@ if (NOT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} MATCHES "build/intermediates/cmake/.*n
       -DGIT_VERSION_STRING=\"${OPENVPN3_GIT}\"
       -DNO_ROUTE_EXCLUDE_EMULATION
       )
-    target_link_libraries(ovpn3 mbedtls mbedx509 mbedcrypto lzo_static_lib)
+    target_link_libraries(ovpn3 mbedtls mbedx509 mbedcrypto lzo)
 else()
     message ("Not budiling OpenVPN for output dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
 endif()
@@ -172,7 +172,7 @@ target_compile_definitions(openvpn PRIVATE
 target_compile_definitions(openvpn PRIVATE
   -DENABLE_CRYPTO_OPENSSL=1
   )
-target_link_libraries(openvpn crypto ssl lzo_static_lib)
+target_link_libraries(openvpn crypto ssl lzo)
 
 add_executable(pie_openvpn.${ANDROID_ABI} minivpn/minivpn.c)
 target_compile_options(pie_openvpn.${ANDROID_ABI} PRIVATE -fPIE)
diff --git a/main/src/main/cpp/lzo.cmake b/main/src/main/cpp/lzo.cmake
index a0afbbda..4122c85e 100644
--- a/main/src/main/cpp/lzo.cmake
+++ b/main/src/main/cpp/lzo.cmake
@@ -71,5 +71,5 @@ set(lzo_srcs
   )
 
 PREPEND(lzo_src_with_path "lzo/src" ${lzo_srcs})
-add_library(lzo_static_lib ${lzo_src_with_path})
-target_include_directories(lzo_static_lib PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/lzo/include")
+add_library(lzo ${lzo_src_with_path})
+target_include_directories(lzo PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/lzo/include")
-- 
cgit v1.2.3