summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyen Dinh Thi <Thi.NguyenDinh@vn.bosch.com>2018-11-23 14:19:54 +0100
committerManikandan C <mchockalingam@de.adit-jv.com>2018-12-19 16:11:09 +0100
commit5f5bd300836479a648d6ef8383f28be9e9a2530b (patch)
tree609fbade90dc3cc960cf7ddcbb206889531b0063
parent09288e66d568e5632dc5cae6e8b9ab43a6432afb (diff)
downloadDLT-daemon-other_improvements.tar.gz
Remove unnecessary reference to zlib in .pc fileother_improvements
Signed-off-by: Nguyen Dinh Thi <Thi.NguyenDinh@vn.bosch.com>
-rw-r--r--CMakeLists.txt3
-rw-r--r--automotive-dlt.pc.in2
2 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 225ba17..f57b174 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,7 +88,10 @@ set( LICENSE "Mozilla Public License Version 2.0" )
# Build, project and include settings
find_package(Threads REQUIRED)
if(WITH_DLT_SYSTEM)
+ set(ZLIB_LIBRARY "-lz")
find_package(ZLIB REQUIRED)
+else(WITH_DLT_SYSTEM)
+ set(ZLIB_LIBRARY "")
endif(WITH_DLT_SYSTEM)
find_package(PkgConfig)
diff --git a/automotive-dlt.pc.in b/automotive-dlt.pc.in
index d587ea1..d19a1e4 100644
--- a/automotive-dlt.pc.in
+++ b/automotive-dlt.pc.in
@@ -24,6 +24,6 @@ Name: DLT
Description: Diagnostic Log and Trace
Version: @DLT_VERSION@
Requires:
-Libs: -L${libdir} -ldlt -lrt -lpthread -lz
+Libs: -L${libdir} -ldlt -lrt -lpthread @ZLIB_LIBRARY@
Cflags: -I${includedir}/dlt -DDLT_@DLT_MAJOR_VERSION@_@DLT_MINOR_VERSION@