summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McCarty <patrick.mccarty@linux.intel.com>2013-04-03 18:29:07 (GMT)
committerPatrick McCarty <patrick.mccarty@linux.intel.com>2013-04-03 18:41:29 (GMT)
commit4a23fc9bded92dbe398068ce5584d3e9e58f4a38 (patch)
treea5d945ad1d356e34d121c8d73b046d59f1a77760
parent2b1c348a1357cde9bd0e1f4865b7adc50aa4d451 (diff)
downloadstarter-4a23fc9bded92dbe398068ce5584d3e9e58f4a38.zip
starter-4a23fc9bded92dbe398068ce5584d3e9e58f4a38.tar.gz
starter-4a23fc9bded92dbe398068ce5584d3e9e58f4a38.tar.bz2
Fix debuginfo generation
There are two issues with apps/home/starter that are preventing debuginfo from being generated: - In the toplevel makefile, CMAKE_C_FLAGS does not include the '-g' flag, so debugging symbols are not added to the /usr/bin/starter binary. By using the %cmake macro in the spec file, the default CFLAGS from RPM (includes '-g') are exported to the build environment, and Cmake correctly uses these compiler flags during the build. - In lock-setting/lockscreen-options/CMakeLists.txt, CMAKE_CXX_FLAGS is used, but the three library source files are C source, not C++. Thus, CMAKE_CXX_FLAGS is undefined by default and does not include CXXFLAGS from the environment. The solution is to use CMAKE_C_FLAGS instead, which picks up CFLAGS from the environment. This commit fixes both issues. Change-Id: Ibe96bf8a34aab05d3cf29c02b33e881cc9eddaf3 Signed-off-by: Patrick McCarty <patrick.mccarty@linux.intel.com>
-rwxr-xr-xlock-setting/lockscreen-options/CMakeLists.txt7
-rw-r--r--[-rwxr-xr-x]packaging/starter.spec2
2 files changed, 4 insertions, 5 deletions
diff --git a/lock-setting/lockscreen-options/CMakeLists.txt b/lock-setting/lockscreen-options/CMakeLists.txt
index 09dde8d..719f98e 100755
--- a/lock-setting/lockscreen-options/CMakeLists.txt
+++ b/lock-setting/lockscreen-options/CMakeLists.txt
@@ -24,12 +24,11 @@ INCLUDE(FindPkgConfig)
pkg_check_modules(pkgs_lock-screen-options REQUIRED elementary ui-gadget-1 edje evas ail capi-appfw-application)
FOREACH(flag ${pkgs_lock-screen-options_CFLAGS})
- SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} ${flag}")
+ SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
ENDFOREACH(flag)
-SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} -fvisibility=hidden -Wall")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXXFLAGS}")
-SET(CMAKE_C_FLAGS ${CMAKE_CXX_FLAGS})
+SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -Wall")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
diff --git a/packaging/starter.spec b/packaging/starter.spec
index ec20f9b..3dbccff 100755..100644
--- a/packaging/starter.spec
+++ b/packaging/starter.spec
@@ -47,7 +47,7 @@ Description: Starter
%prep
%setup -q
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+%cmake .
%build