Add options to LUKS1 format

[platform/core/appfw/app2sd.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e1de89..2b987cb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,15 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(app2ext C)
+PROJECT(app2ext C CXX)
 
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden")
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -g -Wall -Werror")
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
+
+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(app2ext_libpkgs REQUIRED dlog glib-2.0)
+INCLUDE(ApplyPkgConfig)
+PKG_CHECK_MODULES(app2ext_libpkgs REQUIRED dlog glib-2.0)
+PKG_CHECK_MODULES(GMOCK_DEPS REQUIRED gmock)
 
 FOREACH(flag ${app2ext_libpkgs_CFLAGS})
        SET(APP2EXT_CFLAGS "${APP2EXT_CFLAGS} ${flag}")
@@ -25,10 +28,10 @@ AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src APP2EXT_SRCS)
 ADD_LIBRARY(${APP2EXT} SHARED ${APP2EXT_SRCS})
 SET_TARGET_PROPERTIES(${APP2EXT} PROPERTIES SOVERSION ${MAJORVER})
 SET_TARGET_PROPERTIES(${APP2EXT} PROPERTIES VERSION ${FULLVER})
-SET_TARGET_PROPERTIES(${APP2EXT} PROPERTIES COMPILE_FLAGS ${CFLAGS} "-fPIC")
+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)
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/app2sd.pc.in ${CMAKE_BINARY_DIR}/app2sd.pc @ONLY)
 
 INSTALL(TARGETS ${APP2EXT} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
@@ -37,3 +40,4 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION include)
 
 ADD_SUBDIRECTORY(plugin/app2sd)
 ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(unit-tests)