diff options
| author | so.yu <so.yu@samsung.com> | 2013-08-29 19:33:16 +0900 |
|---|---|---|
| committer | so.yu <so.yu@samsung.com> | 2013-08-29 19:33:16 +0900 |
| commit | 1266a27e7741b4325b9b16c33508073fedd6a052 (patch) | |
| tree | 6f2c9839f152663399b72b851bd4dfa6d4753682 | |
| parent | a9b2c5c9d57d8a6f6cd80f05a2cbbad71e7c1588 (diff) | |
| parent | 5a2162a33f3fb1043d7e24f8552c0588e477756b (diff) | |
| download | libcryptsvc-1266a27e7741b4325b9b16c33508073fedd6a052.tar.gz libcryptsvc-1266a27e7741b4325b9b16c33508073fedd6a052.tar.bz2 libcryptsvc-1266a27e7741b4325b9b16c33508073fedd6a052.zip | |
Sync with tizen_2.2tizen_3.0.m14.2_ivi_releasesubmit/tizen_ivi_stable/20131116.100914submit/tizen_ivi_genivi/20140131.040633submit/tizen/20130912.090245submit/tizen/20130912.075936submit/tizen/20130829.121231ivi_oct_m2accepted/tizen_ivi_stable/20131116.111627accepted/tizen/ivi/genivi/20140131.041919accepted/tizen/20130912.195843accepted/tizen/20130912.191746accepted/tizen/20130912.150155accepted/tizen/20130912.095658accepted/tizen/20130912.094053tizen_ivi_genivitizen_3.0.m14.2_iviaccepted/tizen_genericaccepted/tizen/ivi/stableaccepted/tizen/ivi/genivi
Conflicts:
CMakeLists.txt
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e2a98f3..5b53be4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,7 @@ SET(SRCS #${source_dir}/SecKmBase64.c ) -#SET(libcryptsvc_LDFLAGS "-module -avoid-version ${pkgs_LDFLAGS}") +SET(libcryptsvc_LDFLAGS "${pkgs_LDFLAGS}") SET(libcryptsvc_CFLAGS " ${CFLAGS} -fvisibility=hidden -g -fPIC -I${CMAKE_CURRENT_SOURCE_DIR}/include ") SET(libcryptsvc_CPPFLAGS " -DPIC ") @@ -63,7 +63,7 @@ SET(SRCS_TZ ${source_dir}/SecTzSvc.c ) -#SET(libtzsvc_LDFLAGS "-module -avoid-version ${pkgs_LDFLAGS}") +SET(libtzsvc_LDFLAGS "${pkgs_LDFLAGS}") SET(libtzsvc_CFLAGS " ${CFLAGS} -fvisibility=hidden -g -fPIC -I${CMAKE_CURRENT_SOURCE_DIR}/include ") SET(libtzsvc_CPPFLAGS " -DPIC ") |