X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=CMakeLists.txt;h=799d4fa4e4609558ebbb7a2083131de309c1bbf5;hb=25e3498142adb908027629f5f73f501c742b7a0c;hp=56cfec8fe4dbf40becbaef2b7cc15036375214dd;hpb=bbcae4a61702d0ecefad9d8163404bc2c4bc92f3;p=platform%2Fcore%2Fappfw%2Fapp2sd.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 56cfec8..799d4fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,22 +1,10 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(app2ext C)
 
-SET(VERSION_MAJOR 0)
-SET(VERSION "${VERSION_MAJOR}.4.2")
-
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden")
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -g -Wall -Werror")
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
 
 INCLUDE(FindPkgConfig)
-
-IF(TIZEN_FEATURE_APP2SD_PLUGIN)
-	ADD_DEFINITIONS("-DTIZEN_FEATURE_APP2SD_PLUGIN")
-	ADD_DEFINITIONS("-DTIZEN_FEATURE_APP2SD_DMCRYPT_ENCRYPTION")
-	ADD_SUBDIRECTORY(plugin/app2sd)
-ENDIF(TIZEN_FEATURE_APP2SD_PLUGIN)
-
-# app2ext library
 pkg_check_modules(app2ext_libpkgs REQUIRED dlog glib-2.0)
 
 FOREACH(flag ${app2ext_libpkgs_CFLAGS})
@@ -34,9 +22,10 @@ SET(APP2EXT "app2ext")
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src APP2EXT_SRCS)
 
 ADD_LIBRARY(${APP2EXT} SHARED ${APP2EXT_SRCS})
-SET_TARGET_PROPERTIES(${APP2EXT} PROPERTIES SOVERSION ${VERSION_MAJOR})
-SET_TARGET_PROPERTIES(${APP2EXT} PROPERTIES VERSION ${VERSION})
-SET_TARGET_PROPERTIES(${APP2EXT} PROPERTIES COMPILE_FLAGS ${CFLAGS} "-fPIC")
+SET_TARGET_PROPERTIES(${APP2EXT} PROPERTIES SOVERSION ${MAJORVER})
+SET_TARGET_PROPERTIES(${APP2EXT} PROPERTIES VERSION ${FULLVER})
+SET_TARGET_PROPERTIES(${APP2EXT} PROPERTIES COMPILE_FLAGS ${CFLAGS} "-fPIC -fstack-protector-strong")
+SET_TARGET_PROPERTIES(${APP2EXT} PROPERTIES LINK_FLAGS "-Wl,--as-needed,-z,relro")
 TARGET_LINK_LIBRARIES(${APP2EXT} ${app2ext_libpkgs_LDFLAGS})
 
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/app2sd.manifest.in ${CMAKE_BINARY_DIR}/app2sd.manifest @ONLY)
@@ -46,6 +35,5 @@ INSTALL(TARGETS ${APP2EXT} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibra
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/app2sd.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION include)
 
-IF(TIZEN_FEATURE_APP2SD_PLUGIN)
+ADD_SUBDIRECTORY(plugin/app2sd)
 ADD_SUBDIRECTORY(test)
-ENDIF(TIZEN_FEATURE_APP2SD_PLUGIN)