From b8942bf1a49b8ec710fafd7915dd9c8fee62230d Mon Sep 17 00:00:00 2001 From: Keith Davis Date: Mon, 31 May 2021 11:22:35 +0100 Subject: MLCE-500 Link zlib library to ArmNN * Bug fix: link only on Android Signed-off-by: Keith Davis Change-Id: I9f13da41bea9ffc72b75f21cef4faf1902341100 --- cmake/GlobalConfig.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/GlobalConfig.cmake b/cmake/GlobalConfig.cmake index 0a9341f8ab..8757723c10 100644 --- a/cmake/GlobalConfig.cmake +++ b/cmake/GlobalConfig.cmake @@ -66,7 +66,6 @@ endif() # Compiler flags that are always set set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lz") # Necessary for when building with ACL set with compressed kernels if(COMPILER_IS_GNU_LIKE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -Wextra -Werror -Wold-style-cast -Wno-missing-braces -Wconversion -Wsign-conversion") elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC) @@ -75,8 +74,9 @@ elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC) add_definitions(-DNO_STRICT=1) endif() if("${CMAKE_SYSTEM_NAME}" STREQUAL Android) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -llog") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -llog") + # -lz is necessary for when building with ACL set with compressed kernels + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -llog -lz") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -llog -lz") endif() # Compiler flags for Release builds -- cgit v1.2.1