Merge lp:~decathorpe/capnet-assist/fix-1664680 into lp:~elementary-apps/capnet-assist/trunk

Proposed by Fabio Valentini
Status: Merged
Approved by: Cody Garver
Approved revision: 136
Merged at revision: 136
Proposed branch: lp:~decathorpe/capnet-assist/fix-1664680
Merge into: lp:~elementary-apps/capnet-assist/trunk
Diff against target: 10 lines (+0/-1)
1 file modified
CMakeLists.txt (+0/-1)
To merge this branch: bzr merge lp:~decathorpe/capnet-assist/fix-1664680
Reviewer Review Type Date Requested Status
Neal Gompa (community) Approve
David Hewitt code, function Approve
elementary Apps team Pending
Review via email: mp+317260@code.launchpad.net

Commit message

cmake: don't override CFLAGS

Description of the change

This removes the broken CFLAGS override from the CMake build configuration.

To post a comment you must log in.
Revision history for this message
David Hewitt (davidmhewitt) wrote :

The -g flag is also being set in src/CMakeLists.txt anyway so we definitely shouldn't be setting -ggdb as well. Especially not in this way that overwrites other CFLAGS.

review: Approve (code, function)
Revision history for this message
Neal Gompa (ngompa13) wrote :

Looks good to me.

review: Approve

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 2017-01-19 01:04:07 +0000
3+++ CMakeLists.txt 2017-02-14 19:47:24 +0000
4@@ -11,7 +11,6 @@
5
6 set (RELEASE_NAME "GreatBarrier")
7 set (VERSION "0.2.1")
8-set (CMAKE_C_FLAGS "-ggdb")
9 set (TARGET_GLIB 2.32)
10 set (GETTEXT_PACKAGE "${CMAKE_PROJECT_NAME}")
11

Subscribers

People subscribed via source and target branches

to all changes: