Build script refactoring

* Add PIE options to all executables produced by cmake.
* Change SCREEN_READER_FLAGS to be compliant with
  TARGET_COMPILE_OPTIONS format.
* Avoid passing screen reader options to test framework.
  By default screen reader specific options were passed to all
  targets built by cmake files. It is not desirable behaviour
  as we also will build test framework.

Change-Id: I06dc05ba336a5ad6f016ee675b153f4b7b6a34ae

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38638bfc8e42be52b661222949a7262af15eb100..cc8440f13c1fa67d963357d05826c958a8e7215d 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,16 +76,19 @@ FOREACH(flag ${pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-SET(SCREEN_READER_FLAGS "-Wformat -Werror=format-extra-args -Werror=format-zero-length")
+SET(SCREEN_READER_FLAGS "-Wformat" "-Werror=format-extra-args" "-Werror=format-zero-length")
 
 SET(CMAKE_C_FLAGS_DUMP "${CMAKE_C_FLAGS}")
 SET(CMAKE_CXX_FLAGS_DUMP "${CMAKE_CXX_FLAGS}")
-SET(CMAKE_C_FLAGS "${SLP_DEBUG_FLAGS} ${SLP_OPT_FLAGS} ${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} ${SLP_COMPILER_FLAGS} ${SCREEN_READER_FLAGS} -fPIE ")
-SET(CMAKE_CXX_FLAGS "${SLP_DEBUG_FLAGS} ${SLP_OPT_FLAGS} ${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} ${SLP_COMPILER_FLAGS} ${SCREEN_READER_FLAGS}")
+SET(CMAKE_C_FLAGS "${SLP_DEBUG_FLAGS} ${SLP_OPT_FLAGS} ${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} ${SLP_COMPILER_FLAGS} -fPIE ")
+SET(CMAKE_CXX_FLAGS "${SLP_DEBUG_FLAGS} ${SLP_OPT_FLAGS} ${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} ${SLP_COMPILER_FLAGS} -fPIE ")
 
 ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
 ADD_EXECUTABLE(${PROJECT_NAME}-ui ${UI_SRC})
 
+TARGET_COMPILE_OPTIONS(${PROJECT_NAME} PRIVATE ${SCREEN_READER_FLAGS})
+TARGET_COMPILE_OPTIONS(${PROJECT_NAME}-ui PRIVATE ${SCREEN_READER_FLAGS})
+
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} ${SLP_LD_PATH_FLAGS} ${SLP_LD_FLAGS} ${SLP_LINKER_FLAGS} "-pie")
 TARGET_LINK_LIBRARIES(${PROJECT_NAME}-ui ${pkgs_LDFLAGS} ${SLP_LD_PATH_FLAGS} ${SLP_LD_FLAGS} ${SLP_LINKER_FLAGS} "-pie")