fix directories and options

Change-Id: I83c0a65248faaecf8a1b2270003bd0cbd519794a

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 504162b..b8b8b27 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,9 +20,14 @@ cmake_minimum_required(VERSION 2.8)
 
 project("afm-main" LANGUAGES "C")
 
+set(rootdir                 ".")
+set(sysconfdir              "${rootdir}/etc")
+set(prefix                  "${rootdir}/usr")
+set(datadir                 "${prefix}/share")
+
 set(afm_name                "aglfwk")
 set(afm_confdir             "${sysconfdir}/${afm_name}")
-set(afm_datadir             "${datadir}/$(afm_name}")
+set(afm_datadir             "${datadir}/${afm_name}")
 set(afm_appdir              "${afm_datadir}/applications")
 set(afm_icondir             "${afm_datadir}/icons")
 set(afm_prefix              "urn:agl:")

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0512206..8bd7863 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -39,13 +39,13 @@ include_directories(simulation)
 
 add_compile_options(-Wall -Wno-pointer-sign)
 add_compile_options(-ffunction-sections -fdata-sections)
+add_compile_options(-fPIC)
 add_compile_options(-Wl,--gc-sections)
 
-#SET(CMAKE_C_FLAGS_PROFILING    "-g -O0 -pg -Wp,-U_FORTIFY_SOURCE")
-#SET(CMAKE_C_FLAGS_DEBUG        "-g -O0 -ggdb -Wp,-U_FORTIFY_SOURCE")
-#SET(CMAKE_C_FLAGS_RELEASE      "-g -O2")
-#SET(CMAKE_C_FLAGS_CCOV         "-g -O2 --coverage")
-#ADD_COMPILE_OPTIONS("-fPIC")
+set(CMAKE_C_FLAGS_PROFILING    "-g -O0 -pg -Wp,-U_FORTIFY_SOURCE")
+set(CMAKE_C_FLAGS_DEBUG        "-g -O0 -ggdb -Wp,-U_FORTIFY_SOURCE")
+set(CMAKE_C_FLAGS_RELEASE      "-g -O2")
+set(CMAKE_C_FLAGS_CCOV         "-g -O2 --coverage")
 
 ###########################################################################