apply PIE option

Change-Id: Idf95a4e41c2a5d13abba00b6a62ceb0568da9fd3
Signed-off-by: jongmyeongko <jongmyeong.ko@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e33e5ef..d1b2ba2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,23 +13,24 @@ IF(NOT CMAKE_BUILD_TYPE)
 ENDIF(NOT CMAKE_BUILD_TYPE)
 
 # Compiler flags
-SET(CMAKE_C_FLAGS_PROFILING    "-O2")
-SET(CMAKE_CXX_FLAGS_PROFILING  "-O2 -std=c++11")
-SET(CMAKE_C_FLAGS_DEBUG        "-O0 -g")
-SET(CMAKE_CXX_FLAGS_DEBUG      "-O0 -std=c++11 -g")
-SET(CMAKE_C_FLAGS_RELEASE      "-O2 -g")
-SET(CMAKE_CXX_FLAGS_RELEASE    "-O2 -std=c++11 -g")
-SET(CMAKE_CXX_FLAGS_CCOV       "-O0 -std=c++11 -g --coverage")
+SET(EXTRA_FLAGS "-Wall -Wextra")
+SET(CMAKE_C_FLAGS_PROFILING    "-O2 ${EXTRA_FLAGS}")
+SET(CMAKE_CXX_FLAGS_PROFILING  "-O2 -std=c++11 ${EXTRA_FLAGS}")
+SET(CMAKE_C_FLAGS_DEBUG        "-O0 -g ${EXTRA_FLAGS}")
+SET(CMAKE_CXX_FLAGS_DEBUG      "-O0 -std=c++11 -g ${EXTRA_FLAGS}")
+SET(CMAKE_C_FLAGS_RELEASE      "-O2 -g ${EXTRA_FLAGS}")
+SET(CMAKE_CXX_FLAGS_RELEASE    "-O2 -std=c++11 -g ${EXTRA_FLAGS}")
+SET(CMAKE_CXX_FLAGS_CCOV       "-O0 -std=c++11 -g --coverage ${EXTRA_FLAGS}")
+
+# Linker flags
+SET(EXTRA_LINKER_FLAGS "-Wl,--as-needed")
+SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EXTRA_LINKER_FLAGS}")
 
 # Targets
 SET(TARGET_LIBNAME_COMMON "app-installers")
 SET(TARGET_PKGDIR_TOOL "pkgdir-tool")
 SET(TARGET_PKG_INITDB "pkg_initdb")
 
-ADD_DEFINITIONS("-Wall")
-ADD_DEFINITIONS("-Wextra")
-ADD_DEFINITIONS("-fPIE")
-ADD_DEFINITIONS("-fPIC")
 ADD_DEFINITIONS("-DPROJECT_TAG=\"APP_INSTALLERS\"")
 
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")

diff --git a/src/pkg_initdb/CMakeLists.txt b/src/pkg_initdb/CMakeLists.txt
index 19b2b3d..8e8a574 100644 (file)
--- a/src/pkg_initdb/CMakeLists.txt
+++ b/src/pkg_initdb/CMakeLists.txt
@@ -14,5 +14,7 @@ APPLY_PKG_CONFIG(${TARGET_PKG_INITDB} PUBLIC
 )
 # Target - in-package deps
 TARGET_LINK_LIBRARIES(${TARGET_PKG_INITDB} PUBLIC ${TARGET_LIBNAME_COMMON})
+SET_TARGET_PROPERTIES(${TARGET_PKG_INITDB} PROPERTIES COMPILE_FLAGS ${CFLAGS} "-fPIE")
+SET_TARGET_PROPERTIES(${TARGET_PKG_INITDB} PROPERTIES LINK_FLAGS "-pie")
 # Install
 INSTALL(TARGETS ${TARGET_PKG_INITDB} DESTINATION ${BINDIR})

diff --git a/src/pkgdir_tool/CMakeLists.txt b/src/pkgdir_tool/CMakeLists.txt
index b01b40a..33c1574 100644 (file)
--- a/src/pkgdir_tool/CMakeLists.txt
+++ b/src/pkgdir_tool/CMakeLists.txt
@@ -14,6 +14,8 @@ APPLY_PKG_CONFIG(${TARGET_PKGDIR_TOOL} PUBLIC
 )
 # Target - in-package deps
 TARGET_LINK_LIBRARIES(${TARGET_PKGDIR_TOOL} PUBLIC ${TARGET_LIBNAME_COMMON})
+SET_TARGET_PROPERTIES(${TARGET_PKGDIR_TOOL} PROPERTIES COMPILE_FLAGS ${CFLAGS} "-fPIE")
+SET_TARGET_PROPERTIES(${TARGET_PKGDIR_TOOL} PROPERTIES LINK_FLAGS "-pie")
 
 # Install
 INSTALL(TARGETS ${TARGET_PKGDIR_TOOL} DESTINATION ${BINDIR})

diff --git a/src/unit_tests/CMakeLists.txt b/src/unit_tests/CMakeLists.txt
index fab013c..e52c495 100644 (file)
--- a/src/unit_tests/CMakeLists.txt
+++ b/src/unit_tests/CMakeLists.txt
@@ -17,6 +17,6 @@ APPLY_PKG_CONFIG(signature_unittest PUBLIC
 # FindGTest module do not sets all needed libraries in GTEST_LIBRARIES and
 # GTest main libraries is still missing, so additional linking of
 # GTEST_MAIN_LIBRARIES is needed.
-target_link_libraries(signature_unittest PUBLIC ${TARGET_LIBNAME_COMMON} ${GTEST_MAIN_LIBRARIES} pthread)
+TARGET_LINK_LIBRARIES(signature_unittest PUBLIC ${TARGET_LIBNAME_COMMON} ${GTEST_MAIN_LIBRARIES} pthread)
 
 INSTALL(TARGETS signature_unittest DESTINATION ${BINDIR}/${DESTINATION_DIR})