Ubuntu Application Launcher

Merge lp:~ted/ubuntu-app-launch/fix-profiling-flags into lp:ubuntu-app-launch/16.10

  1. fix-profiling-flags
  2. Merge into trunk.16.10
Proposed by Ted Gould
Status: Work in progress
Proposed branch: lp:~ted/ubuntu-app-launch/fix-profiling-flags
Merge into: lp:ubuntu-app-launch/16.10
Diff against target: 25 lines (+8/-0)
1 file modified
CMakeLists.txt (+8/-0)
To merge this branch: bzr merge lp:~ted/ubuntu-app-launch/fix-profiling-flags
Reviewer Review Type Date Requested Status
Unity API Team Pending
Review via email: mp+305105@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

251. By Ted Gould

Make it status so it looks nice

250. By Ted Gould

Add in profiling flags if requested

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-08-17 15:24:23 +0000
3+++ CMakeLists.txt 2016-09-07 14:04:46 +0000
4@@ -13,6 +13,7 @@
5 ##########################
6
7 option (enable_tests "Build tests" ON)
8+option (enable_profiling "Build profiling" OFF)
9
10 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
11
12@@ -61,6 +62,13 @@
13 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
14 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
15
16+if (${enable_profiling})
17+ message(STATUS "Adding in profiling flags")
18+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -finstrument-functions -fno-omit-frame-pointer -g")
19+else()
20+ message(STATUS "Profiling flags removed")
21+endif()
22+
23 enable_testing()
24
25 pkg_check_modules(GLIB2 REQUIRED glib-2.0)

Subscribers

People subscribed via source and target branches