apply PIE option 70/75070/3 accepted/tizen/common/20160620.163126 accepted/tizen/ivi/20160617.083634 accepted/tizen/mobile/20160617.083459 accepted/tizen/tv/20160617.083330 accepted/tizen/wearable/20160617.083659 submit/tizen/20160616.134250
authorjongmyeongko <jongmyeong.ko@samsung.com>
Thu, 16 Jun 2016 11:34:45 +0000 (20:34 +0900)
committerjongmyeongko <jongmyeong.ko@samsung.com>
Thu, 16 Jun 2016 13:24:05 +0000 (22:24 +0900)
Change-Id: If43a9e8180109440984ec5d2982b7c908cc2e2bb
Signed-off-by: jongmyeongko <jongmyeong.ko@samsung.com>
CMakeLists.txt
src/tpk/CMakeLists.txt
src/unit_tests/CMakeLists.txt

index 97f52baa76a4fc1fb5613ea7ec66ed56ee45d738..eb48c3cc8ab4835ea70b9087ad386c7cd693ead0 100644 (file)
@@ -13,13 +13,18 @@ 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_TPK "tpk-installer")
@@ -29,10 +34,6 @@ SET(TARGET_SMOKE_TEST "smoke-test")
 SET(TARGET_SMOKE_TEST_HELPER "smoke-test-helper")
 SET(TARGET_MANIFEST_TEST "manifest-test")
 
-ADD_DEFINITIONS("-Wall")
-ADD_DEFINITIONS("-Wextra")
-ADD_DEFINITIONS("-fPIE")
-ADD_DEFINITIONS("-fPIC")
 ADD_DEFINITIONS("-DPROJECT_TAG=\"TPK_BACKEND\"")
 
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
index d97ee3fdeb695f6f6748a929229ae707935813a7..ed540809b6eb9126efa314b95b0d680e81a6cc14 100644 (file)
@@ -29,6 +29,8 @@ APPLY_PKG_CONFIG(${TARGET_LIBNAME_TPK} PUBLIC
 )
 
 TARGET_LINK_LIBRARIES(${TARGET_TPK_BACKEND} PRIVATE ${TARGET_LIBNAME_TPK})
+SET_TARGET_PROPERTIES(${TARGET_TPK_BACKEND} PROPERTIES COMPILE_FLAGS ${CFLAGS} "-fPIE")
+SET_TARGET_PROPERTIES(${TARGET_TPK_BACKEND} PROPERTIES LINK_FLAGS "-pie")
 
 INSTALL(TARGETS ${TARGET_LIBNAME_TPK} DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(TARGETS ${TARGET_TPK_BACKEND} DESTINATION ${BINDIR})
index 31dafaad2cb9a380a8742d5e99b4153179770ac1..dcb4d43ad56a6974aede744696152d6750f823a9 100644 (file)
@@ -36,9 +36,9 @@ APPLY_PKG_CONFIG(${TARGET_MANIFEST_TEST} 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(${TARGET_SMOKE_TEST} PRIVATE ${TARGET_LIBNAME_TPK} ${GTEST_MAIN_LIBRARIES})
-target_link_libraries(${TARGET_SMOKE_TEST_HELPER} PRIVATE ${TARGET_LIBNAME_TPK})
-target_link_libraries(${TARGET_MANIFEST_TEST} PRIVATE ${TARGET_LIBNAME_TPK} ${GTEST_MAIN_LIBRARIES})
+TARGET_LINK_LIBRARIES(${TARGET_SMOKE_TEST} PRIVATE ${TARGET_LIBNAME_TPK} ${GTEST_MAIN_LIBRARIES})
+TARGET_LINK_LIBRARIES(${TARGET_SMOKE_TEST_HELPER} PRIVATE ${TARGET_LIBNAME_TPK})
+TARGET_LINK_LIBRARIES(${TARGET_MANIFEST_TEST} PRIVATE ${TARGET_LIBNAME_TPK} ${GTEST_MAIN_LIBRARIES})
 
 INSTALL(TARGETS ${TARGET_SMOKE_TEST} DESTINATION ${BINDIR}/${DESTINATION_DIR})
 INSTALL(TARGETS ${TARGET_SMOKE_TEST_HELPER} DESTINATION ${BINDIR}/${DESTINATION_DIR})