X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=popup-wifidirect%2FCMakeLists.txt;h=b1bbe6b2b3d0c54c9d7e5251f4645a0e705909a1;hb=ea0eb10918bf56338ccea1405cab0eaa5fac0782;hp=0b993db65c16c2a6ce48b4cac9ae7d824cd4cf46;hpb=2862180e1407377dd19d90f46291e95fa57b5979;p=apps%2Fnative%2Fug-wifi-direct.git

diff --git a/popup-wifidirect/CMakeLists.txt b/popup-wifidirect/CMakeLists.txt
old mode 100755
new mode 100644
index 0b993db..b1bbe6b
--- a/popup-wifidirect/CMakeLists.txt
+++ b/popup-wifidirect/CMakeLists.txt
@@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(wifi-direct-popup C)
 SET(PACKAGE_NAME org.tizen.wifi-direct-popup)
 
-SET(PREFIX /opt/apps/${PACKAGE_NAME})
+SET(PREFIX /usr/apps/${PACKAGE_NAME})
 SET(BINDIR "${PREFIX}/bin")
 SET(RESDIR "${PREFIX}/res")
 SET(LOCALEDIR "${RESDIR}/locale")
@@ -19,9 +19,9 @@ SET(SRCS
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 
-SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -DVITA_FEATURE")
-SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
-SET(CMAKE_C_FLAGS_RELEASE "-O2")
+SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -DVITA_FEATURE -fPIE")
+SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -fPIE")
+SET(CMAKE_C_FLAGS_RELEASE "-O2 -fPIE")
 
 IF("${ARCH}" STREQUAL "arm")
 	ADD_DEFINITIONS("-DTARGET")
@@ -32,15 +32,22 @@ ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")
 ADD_DEFINITIONS("-DRESDIR=\"${RESDIR}\"")
 
 ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
-
+ADD_CUSTOM_TARGET(wfd_popup.edj
+                COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/resources/images
+                ${CMAKE_CURRENT_SOURCE_DIR}/resources/wfd_popup.edc ${CMAKE_BINARY_DIR}/wfd_popup.edj
+                DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/resources/wfd_popup.edc
+)
+ADD_DEPENDENCIES(${PROJECT_NAME} wfd_popup.edj)
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
+INSTALL(FILES ${CMAKE_BINARY_DIR}/wfd_popup.edj DESTINATION ${EDJDIR})
 
 #CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE_NAME}.desktop.in ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.desktop)
 #INSTALL(FILES ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.desktop DESTINATION /opt/share/applications)
 #for appfw new manifest
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE_NAME}.xml ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.xml)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE_NAME}.xml DESTINATION "/opt/share/packages/")
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE_NAME}.xml DESTINATION "/usr/share/packages/")
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources/images/ DESTINATION ${IMGDIR})
 
 ADD_SUBDIRECTORY(po)