Noise

Merge lp:~elementary-apps/noise/binary-location into lp:~elementary-apps/noise/trunk

  1. binary-location
  2. Merge into trunk
Proposed by Julián Unrrein
Status: Merged
Approved by: Cody Garver
Approved revision: 1529
Merged at revision: 1529
Proposed branch: lp:~elementary-apps/noise/binary-location
Merge into: lp:~elementary-apps/noise/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
src/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~elementary-apps/noise/binary-location
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
Review via email: mp+184499@code.launchpad.net

Commit message

Change Noise's binary location when built from build/src/noise to build/noise.

Description of the change

Change Noise's binary location when built from build/src/noise to build/noise.

This was requested by Shnatsel, to have a consistent location of binaries across elementary apps.

An unintended side effect is that the object files target location changes from build/src/CMakeFiles/noise.dir to build/src/noise.dir (for the source files located under src/). Maybe this can be reverted, but I don't know how.

To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/CMakeLists.txt'
2--- src/CMakeLists.txt 2013-06-12 18:04:28 +0000
3+++ src/CMakeLists.txt 2013-09-09 02:47:02 +0000
4@@ -104,7 +104,7 @@
5 ${CLIENT_VAPI}
6 )
7
8-set(EXEC_NAME ${SRC_TARGET})
9+set(EXEC_NAME ../${SRC_TARGET})
10
11 add_definitions(${DEPS_CFLAGS})
12 link_directories(${DEPS_LIBRARY_DIRS})

Subscribers

People subscribed via source and target branches