Fix discovering dukgenerator and cryptsvc modules.

[Issue#] N/A
[Problem] References to libraries from modules dukgenerator and cryptsvc
are hardcoded in this repository's build scripts.
[Cause] N/A
[Solution] Discover library names from dukgenerator and cryptsvc *.pc
files.
[SCMRequest] N/A

[Verification]
1. Build respository.
2. Run `wrt-extra-tests-tizen --output=text --regexp='^TC(4|21|22)$'`.

Change-Id: I4a07f237e8ecf53b8f2cb89d294cfff7b8fe9556

diff --git a/build/encryption/CMakeLists.txt b/build/encryption/CMakeLists.txt
index 7949864..6e643b2 100644 (file)
--- a/build/encryption/CMakeLists.txt
+++ b/build/encryption/CMakeLists.txt
@@ -23,6 +23,8 @@ INCLUDE(FindPkgConfig)
 PKG_CHECK_MODULES(SYS_ENCRYPTION
     dlog
     openssl
+    cryptsvc
+    dukgenerator
     REQUIRED
 )
 
@@ -54,9 +56,6 @@ TARGET_LINK_LIBRARIES(${TARGET_DPL_ENCRYPTION}
     ${TARGET_DPL_EFL}
 )
 
-TARGET_LINK_LIBRARIES(${TARGET_DPL_ENCRYPTION} "-ldukgenerator" )
-TARGET_LINK_LIBRARIES(${TARGET_DPL_ENCRYPTION} "-lcryptsvc" )
-
 # Target library properties
 SET_TARGET_PROPERTIES(${TARGET_DPL_ENCRYPTION} PROPERTIES
     SOVERSION ${API_VERSION}

diff --git a/packaging/wrt-commons.spec b/packaging/wrt-commons.spec
index 5e10bc5..06d58e7 100644 (file)
--- a/packaging/wrt-commons.spec
+++ b/packaging/wrt-commons.spec
@@ -23,8 +23,8 @@ BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(libiri)
 BuildRequires:  pkgconfig(libidn)
-BuildRequires:  libcryptsvc-devel
-BuildRequires:  dukgenerator-devel
+BuildRequires:  pkgconfig(cryptsvc)
+BuildRequires:  pkgconfig(dukgenerator)
 Requires: libcryptsvc
 
 %description